diff --git a/settings.json.template b/settings.json.template index 7d175a34e..087c710c5 100644 --- a/settings.json.template +++ b/settings.json.template @@ -27,7 +27,7 @@ */ //the default text of a pad - "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n", + "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n", /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */ "requireSession" : false, diff --git a/src/static/css/pad.css b/src/static/css/pad.css index df9dde143..5ee6b3c56 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -783,6 +783,23 @@ input[type=checkbox] { padding: 4px 1px } } +@media screen and (max-width: 400px){ + #editorcontainer { + top: 68px; + } + #editbar { + height: 62px; + } + .toolbar ul.menu_right { + float: left; + margin-top:2px; + } + .popup { + width:100%; + max-width:300px; + top: 72px !important; + } +} @media only screen and (min-device-width: 320px) and (max-device-width: 720px) { #users { top: 36px; diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index 09f3d79f2..5a9e7b9b6 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -85,11 +85,13 @@ var padeditor = (function() if (value == "false") return false; return defaultValue; } - self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue); var v; + v = getOption('rtlIsTrue', false); + self.ace.setProperty("rtlIsTrue", v); + v = getOption('showLineNumbers', true); self.ace.setProperty("showslinenumbers", v); padutils.setCheckbox($("#options-linenoscheck"), v); diff --git a/src/templates/index.html b/src/templates/index.html index 40d46fc8a..cdd9346de 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -55,7 +55,6 @@ background: -moz-linear-gradient(#fff,#ccc); background: -ms-linear-gradient(#fff,#ccc); background: -o-linear-gradient(#fff,#ccc); - opacity: .9; box-shadow: 0px 1px 8px rgba(0,0,0,0.3); } #inner { diff --git a/src/templates/pad.html b/src/templates/pad.html index ac920dc2b..d65e41e89 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -334,7 +334,7 @@