mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 17:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' of github.com:Pita/etherpad-lite into release/releases-1.1.5

Browse source
This commit is contained in:
John McLear 2012-10-31 12:32:12 +00:00
commit 28acfc70de
4 changed files with 191 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/static/css/timeslider.css
View file

@ -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)
}
}

1
src/static/js/timeslider.js
View file

@ -158,6 +158,7 @@ function handleClientVars(message)
{
fireWhenAllScriptsAreLoaded[i]();
}
$("#ui-slider-handle").css('left', $("#ui-slider-bar").width() - 2);
}
exports.baseURL = '';