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 github.com:sciunto/etherpad-lite

Browse source 
Conflicts:
	src/package.json
	src/templates/timeslider.html
This commit is contained in:
François Boulogne 2012-11-15 20:46:59 +01:00
commit 7761409374
43 changed files with 530 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -786,6 +786,23 @@ input[type=checkbox] {
padding: 4px 1px
}
}
@media screen and (max-width: 400px){
#editorcontainer {
top: 68px;
}
#editbar {
height: 62px;
}
.toolbar ul.menu_right {
float: left;
margin-top:2px;
}
.popup {
width:100%;
max-width:300px;
top: 72px !important;
}
}
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
#users {
top: 36px;