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

2 files changed, 35 insertions, 9 deletions

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index f59403fc..fb2cb82b 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -436,6 +436,12 @@ table#otheruserstable {
   height: 13px;
   overflow: hidden;
   margin: 0 4px;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 .usertdswatch {
   width: 1%
@@ -968,12 +974,15 @@ input[type=checkbox] {
 }
 @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
     #users {
-      top: 36px;
-      bottom: 40px;
-      border-radius: none;
+      top: auto;
+      right:0px !important;
+      bottom: 33px;
+      border-radius: 0px !important;
     }
     #mycolorpicker {
       left: -73px;
+      top:auto !important;
+      bottom:33px !important;
       /* #mycolorpicker: width -#users: width */;
     }
     #editorcontainer {
@@ -990,6 +999,7 @@ input[type=checkbox] {
       background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
       background: linear-gradient(#f7f7f7, #f1f1f1 80%);
       width: 100%;
+      right:0px !important;
       overflow: hidden;
       height: 32px;
       position: fixed;
@@ -1009,8 +1019,16 @@ input[type=checkbox] {
     .toolbar ul li a.selected {
       background: none !important
     }
-    #chaticon, #timesliderlink {
-      display: none !important
+    li[data-key="showusers"] > a {
+      
+      margin-top:-10px;
+      padding-top:2px !important;
+      line-height:20px;
+      vertical-align:top !important;
+    }
+    #chaticon {
+      position:absolute;
+      right:48px;
     }
     .popup {
       -webkit-border-radius: 0;
@@ -1023,11 +1041,11 @@ input[type=checkbox] {
       width: 100%;
     }
     #settings,
-    #importexport,
+    #import_export,
     #connectivity,
     #embed {
+      top:auto;
       left: 0;
-      top: 0;
       bottom: 33px;
       right: 0;
     }
@@ -1037,6 +1055,14 @@ input[type=checkbox] {
     #online_count {
       line-height: 24px
     }
+    #chatbox{
+      position:absolute;
+      bottom:33px;
+    }
+    #gritter-notice-wrapper{
+      bottom:43px !important;
+      right:10px !important;
+    }
 }
 
 #passwordRequired{
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 76a79a62..7e750a3e 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -180,8 +180,8 @@ var padeditbar = (function()
       return this;
     },
     redrawHeight: function(){
-      var editbarHeight = $('.menu_left').height() + 2 + "px";
-      var containerTop = $('.menu_left').height() + 7 + "px";
+      var editbarHeight = $('.menu_left').height() + 1 + "px";
+      var containerTop = $('.menu_left').height() + 6 + "px";
       $('#editbar').css("height", editbarHeight);
 
       $('#editorcontainer').css("top", containerTop);