merged develop back in

3 files changed, 4 insertions, 3 deletions

diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css
index 5f24a4cf..1dd0ca91 100644
--- a/src/static/css/timeslider.css
+++ b/src/static/css/timeslider.css
@@ -59,7 +59,7 @@
   cursor: pointer;
   height: 35px;
   margin-left: 5px;
-  margin-right: 148px;
+  margin-right: 150px;
   position: relative;
   top: 20px;
 }
@@ -292,4 +292,4 @@ OL {
 }
 * HTML .pause#playpause_button_icon {
   background-image: url(../../static/img/pause.gif)
-}
\ No newline at end of file
+}
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js
index dd4fd1e5..645b7fce 100644
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@@ -516,7 +516,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
           {
             var type;
             var rr = cls && /(?:^| )list-([a-z]+[12345678])\b/.exec(cls);
-            type = rr && rr[1] || "bullet" + String(Math.min(_MAX_LIST_LEVEL, (state.listNesting || 0) + 1));
+            type = rr && rr[1] || (tname == "ul" ? "bullet" : "number") + String(Math.min(_MAX_LIST_LEVEL, (state.listNesting || 0) + 1));
             oldListTypeOrNull = (_enterList(state, type) || 'none');
           }
           else if ((tname == "div" || tname == "p") && cls && cls.match(/(?:^| )ace-line\b/))
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index a2156b16..5203e57b 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -158,6 +158,7 @@ function handleClientVars(message)
   {
     fireWhenAllScriptsAreLoaded[i]();
   }
+  $("#ui-slider-handle").css('left', $("#ui-slider-bar").width() - 2);
 }
 
 exports.baseURL = '';