mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

better css

Browse source
This commit is contained in:
John McLear 2015-02-09 17:37:20 +00:00
parent ebff7d128b
commit 4af46921e1
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -919,7 +919,8 @@ input[type=checkbox] {
right:0px !important; right:0px !important;
border-radius:0px !important; border-radius:0px !important;
width:182px !important; width:182px !important;
margin:2px 0 0 0 !important; /* Below makes UI look weird when X makes editbar flow onto two lines */
/* margin:2px 0 0 0 !important;*/
border: none !important; border: none !important;
border-bottom: 1px solid #ccc !important; border-bottom: 1px solid #ccc !important;
height:155px !important; height:155px !important;
@ -937,7 +938,7 @@ input[type=checkbox] {
padding:0 !important; padding:0 !important;
margin:0 !important; margin:0 !important;
right:0 !important; right:0 !important;
top: 200px !important; top: 200px;
width:182px !important; width:182px !important;
border: none !important; border: none !important;
padding:5px !important; padding:5px !important;

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

@ -186,9 +186,20 @@ var padeditbar = (function()
$('#editbar').css("height", editbarHeight); $('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop); $('#editorcontainer').css("top", containerTop);
// If sticky chat is enabled..
if($('#options-stickychat').is(":checked")){ if($('#options-stickychat').is(":checked")){
$('#chatbox').css("top", $('#editorcontainer').offset().top + "px"); $('#chatbox').css("top", $('#editorcontainer').offset().top + "px");
}; };
// If chat and Users is enabled..
if($('#options-chatandusers').is(":checked")){
$('#users').css("top", $('#editorcontainer').offset().top + "px");
// We also need to move the chatbox lower..
$('#chatbox').css("top", 10 + $('#users').height() + $('#editorcontainer').offset().top + "px");
}
}, },
registerDropdownCommand: function (cmd, dropdown) { registerDropdownCommand: function (cmd, dropdown) {
dropdown = dropdown || cmd; dropdown = dropdown || cmd;