diff --git a/static/css/pad.css b/static/css/pad.css index 33fc49a9..0c1e4bc1 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -472,12 +472,10 @@ table#otheruserstable { display: none; } background: url(../../static/img/connectingbar.gif) no-repeat center 60px; height: 100px; } -.modaldialog.cboxreconnecting { - background: #fed; -} +.modaldialog.cboxreconnecting, .modaldialog.cboxconnecting, .modaldialog.cboxdisconnected { - background: #fdd; + background: #8FCDE0; } .cboxdisconnected #connectionboxinner div { display: none; } .cboxdisconnected_userdup #connectionboxinner #disconnected_userdup { display: block; } @@ -1150,11 +1148,6 @@ label[for=readonlyinput] { margin: 0 10px 0 2px; } -@media screen and (max-width: 600px) { - #editbar ul li { - padding: 4px 1px; - } -} #qr_center { margin: 10px 10px auto 0; @@ -1164,3 +1157,93 @@ label[for=readonlyinput] { #qrcode{ margin-left:10px; } + + +@media screen and (max-width: 960px) { + .modaldialog { + position: relative; + margin: 0 auto; + width: 80%; + top: 40px; + left: 0; + } +} + +@media screen and (max-width: 600px) { + #editbar ul li { + padding: 4px 1px; + } +} + +@media only screen and (min-device-width: 320px) and (max-device-width: 600px) { + #editbar ul li { + padding: 4px 3px; + } + #editbar ul#menu_right > li { + padding: 4px 8px; + margin-top: 2px; + } + #chaticon { + opacity: .8; + } + #users { + right: none; + left: 30px; + } + #mycolorpicker { + right: 0; + left: 0 !important; + } + #editorcontainer { + margin-bottom: 33px; + } + #editbar ul#menu_right { + background: #f7f7f7; + background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%); + width: 100%; + overflow: hidden; + height: 32px; + position: fixed; + bottom: 0; + border-top: 1px solid #ccc; + } + #editbar ul#menu_right li:not(:last-child) { + display: none; + } + #editbar ul#menu_right li:last-child { + height: 24px; + border-radius: 0; + margin-top: 0; + border: 0; + float: right; + } + #chaticon { + bottom: 0; + right: 55px; + border-right: none; + border-radius: 0; + background: #f7f7f7; + background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%); + border: 0; + } + #chatbox { + bottom: 32px; + right: 0; + border-top-right-radius: 0; + } + #editbar ul li a span { + top: -3px; + } + #usericonback { + margin-top: 4px; + } + #sidediv { + display:none; + } +} \ No newline at end of file diff --git a/static/index.html b/static/index.html index 2bed58f9..eb41e8af 100644 --- a/static/index.html +++ b/static/index.html @@ -1,6 +1,8 @@ + Etherpad Lite + -
-
New Pad

or create/open a Pad with the name
-
- +
New Pad

or create/open a Pad with the name
+ +
@@ -124,5 +145,4 @@ //start the costum js if(typeof costumStart == "function") costumStart(); - \ No newline at end of file diff --git a/static/js/chat.js b/static/js/chat.js index 0dd2b3c1..bda5786d 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -16,6 +16,10 @@ var chat = (function() { + var ua = navigator.userAgent.toLowerCase(); + var isAndroid = ua.indexOf("android") > -1; + var isMobileSafari = ua.indexOf("mobile") > -1; + var bottomMargin = "0px"; var chatMentions = 0; var title = document.title; var self = { @@ -41,7 +45,10 @@ var chat = (function() { $("#focusprotector").hide(); - $("#chatbox").css({right: "20px", bottom: "0px", left: "", top: ""}); + if(isAndroid || isMobileSafari) + bottommargin = "32px"; + + $("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""}); self.scrollDown(); } @@ -53,10 +60,14 @@ var chat = (function() hide: function () { $("#chatcounter").text("0"); - $("#chatbox").hide("slide", { direction: "down" }, 750, function() + if(isAndroid || isMobileSafari) { + $("#chatbox").toggle(); + } + else { - $("#chaticon").show("slide", { direction: "down" }, 500); - }); + $("#chatbox").toggle("slide", { direction: "down" }, 625); + } + }, scrollDown: function() { @@ -155,4 +166,4 @@ var chat = (function() } return self; -}()); +}()); \ No newline at end of file diff --git a/static/pad.html b/static/pad.html index 3b766ae7..35ec559b 100644 --- a/static/pad.html +++ b/static/pad.html @@ -4,6 +4,7 @@ Etherpad Lite + @@ -57,7 +58,7 @@
  • -     +
  • @@ -330,4 +331,4 @@ - + \ No newline at end of file