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

Merge branch 'develop' of git://github.com/ether/etherpad-lite

Browse source 
Conflicts:
	src/templates/pad.html
	src/templates/timeslider.html
This commit is contained in:
François Boulogne 2012-11-15 20:52:24 +01:00
commit d3ead86db1
87 changed files with 12193 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -751,6 +751,15 @@ input[type=checkbox] {
.popup p {
margin: 5px 0
}
.popup select {
background: #fff;
padding: 2px;
height: 24px;
border-radius: 3px;
border: 1px solid #ccc;
outline: none;
min-width: 105px;
}
.column {
float: left;
width: 50%;