diff options
| author | John McLear <john@mclear.co.uk> | 2015-02-09 17:37:20 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-02-09 17:37:20 +0000 |
| commit | 4af46921e104016cd81cd20f2bff52651797655f (patch) | |
| tree | 7789b25502d714ade908beb7e2ef3ed6af36f36f | |
| parent | ebff7d128b94af263318bc611286670cfe71deda (diff) | |
| download | etherpad-lite-4af46921e104016cd81cd20f2bff52651797655f.zip | |
better css
| -rw-r--r-- | src/static/css/pad.css | 5 | ||||
| -rw-r--r-- | src/static/js/pad_editbar.js | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 70c15b51..e9a91f4e 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -919,7 +919,8 @@ input[type=checkbox] { right:0px !important; border-radius:0px !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-bottom: 1px solid #ccc !important; height:155px !important; @@ -937,7 +938,7 @@ input[type=checkbox] { padding:0 !important; margin:0 !important; right:0 !important; - top: 200px !important; + top: 200px; width:182px !important; border: none !important; padding:5px !important; diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index e874614f..56018b35 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -186,9 +186,20 @@ var padeditbar = (function() $('#editbar').css("height", editbarHeight); $('#editorcontainer').css("top", containerTop); + + // If sticky chat is enabled.. if($('#options-stickychat').is(":checked")){ $('#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) { dropdown = dropdown || cmd; |