libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change

Browse source
This commit is contained in:
John McLear 2014-11-29 00:56:18 +00:00
commit 607c2119a9
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -967,12 +967,15 @@ input[type=checkbox] {
} }
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) { @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
#users { #users {
top: 36px; top: auto;
bottom: 40px; right:0px !important;
border-radius: none; bottom: 33px;
border-radius: 0px !important;
} }
#mycolorpicker { #mycolorpicker {
left: -73px; left: -73px;
top:auto !important;
bottom:33px !important;
/* #mycolorpicker: width -#users: width */; /* #mycolorpicker: width -#users: width */;
} }
#editorcontainer { #editorcontainer {
@ -989,6 +992,7 @@ input[type=checkbox] {
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
width: 100%; width: 100%;
right:0px !important;
overflow: hidden; overflow: hidden;
height: 32px; height: 32px;
position: fixed; position: fixed;
@ -1008,8 +1012,16 @@ input[type=checkbox] {
.toolbar ul li a.selected { .toolbar ul li a.selected {
background: none !important background: none !important
} }
#chaticon, #timesliderlink { li[data-key="showusers"] > a {
display: none !important
margin-top:-10px;
padding-top:2px !important;
line-height:20px;
vertical-align:top !important;
}
#chaticon {
position:absolute;
right:48px;
} }
.popup { .popup {
-webkit-border-radius: 0; -webkit-border-radius: 0;
@ -1022,11 +1034,11 @@ input[type=checkbox] {
width: 100%; width: 100%;
} }
#settings, #settings,
#importexport, #import_export,
#connectivity, #connectivity,
#embed { #embed {
top:auto;
left: 0; left: 0;
top: 0;
bottom: 33px; bottom: 33px;
right: 0; right: 0;
} }
@ -1036,6 +1048,14 @@ input[type=checkbox] {
#online_count { #online_count {
line-height: 24px line-height: 24px
} }
#chatbox{
position:absolute;
bottom:33px;
}
#gritter-notice-wrapper{
bottom:43px !important;
right:10px !important;
}
} }
#passwordRequired{ #passwordRequired{

4
src/static/js/pad_editbar.js
View file

@ -180,8 +180,8 @@ var padeditbar = (function()
return this; return this;
}, },
redrawHeight: function(){ redrawHeight: function(){
var editbarHeight = $('.menu_left').height() + 2 + "px"; var editbarHeight = $('.menu_left').height() + 1 + "px";
var containerTop = $('.menu_left').height() + 7 + "px"; var containerTop = $('.menu_left').height() + 6 + "px";
$('#editbar').css("height", editbarHeight); $('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop); $('#editorcontainer').css("top", containerTop);