timeslider fixes

pull/2417/head
John McLear 2014-12-27 22:31:23 +01:00
parent b1f29b914c
commit c276343216
2 changed files with 12 additions and 3 deletions

View File

@ -188,8 +188,15 @@ stepper:active{
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
#editbarright { .editbarright {
float: right float: right;
text-align: right;
height: 30px !important;
}
.toolbar ul{
position:relative;
float:right;
height:30px;
} }
#settings, #settings,
#import_export, #import_export,
@ -224,7 +231,6 @@ stepper:active{
border-bottom: none; border-bottom: none;
float: right; float: right;
width: 170px; width: 170px;
width: initial;
} }
.timeslider-bar h1 { .timeslider-bar h1 {
margin: 5px margin: 5px

View File

@ -29,6 +29,9 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
{ {
var BroadcastSlider; var BroadcastSlider;
// Hack to ensure timeslider i18n values are in
$("[data-key='timeslider_returnToPad'] > a > span").html(html10n.get("timeslider.toolbar.returnbutton"));
(function() (function()
{ // wrap this code in its own namespace { // wrap this code in its own namespace
var sliderLength = 1000; var sliderLength = 1000;