mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 18:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' into timeslider_authors

Browse source 
Conflicts:
	src/static/css/pad.css
	src/templates/timeslider.html
This commit is contained in:
Matthias Bartelmeß 2012-04-05 21:47:59 +02:00
commit 9e042ee942
50 changed files with 1605 additions and 1819 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,10 +45,10 @@
#leftstar, #rightstar, #leftstep, #rightstep
{background:url(../../static/img/stepper_buttons.png) 0 0 no-repeat; height:21px; overflow:hidden; position:absolute;}
#leftstar {background-position:0 44px; right:34px; top:8px; width:30px;}
#rightstar {background-position:29px 44px; right:5px; top:8px; width:29px;}
#leftstep {background-position:0 22px; right:34px; top:20px; width:30px;}
#rightstep {background-position:29px 22px; right:5px; top:20px; width:29px;}
#leftstar {background-position:0 -44px; right:34px; top:8px; width:30px;}
#rightstar {background-position:-29px -44px; right:5px; top:8px; width:29px;}
#leftstep {background-position:0 -22px; right:34px; top:20px; width:30px;}
#rightstep {background-position:-29px -22px; right:5px; top:20px; width:29px;}
#timeslider .star {
background-image:url(../../static/img/star.png);
@ -75,8 +75,11 @@
#padmain {top:0px !important;}
#editbarright {float:right;}
#returnbutton {color:#222; font-size:16px; line-height:29px; margin-top:0; padding-right:6px;}
#importexport {top:118px;}
#importexport .popup {width:185px;}
#importexport{
top:118px;
width:185px;
}
.timeslider-bar