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

Merge branch 'johnyma22'

Browse source 
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
This commit is contained in:
Egil Moeller 2012-04-01 13:27:38 +02:00
commit 33c53e61c2
13 changed files with 179 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/static/css/pad.css
View file

@ -1036,6 +1036,9 @@ margin-top: 1px;
background-position: 0px -183px;
display: inline-block;
}
.buttonicon-savedRevision {
background-position: 0px -493px
}
#usericon
{
@ -1269,4 +1272,4 @@ input[type=checkbox] {
#online_count {
line-height: 24px;
}
}
}

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

@ -71,8 +71,11 @@
#padmain {top:30px;}
#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;
}
/* lists */
.list-bullet2, .list-indent2, .list-number2 {margin-left:3em;}