Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests

This commit is contained in:
johnyma22 2012-10-30 17:22:08 +00:00
commit 14ef06c699
5 changed files with 22 additions and 4 deletions

View file

@ -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;

View file

@ -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);

View file

@ -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 {

View file

@ -334,7 +334,7 @@
<div id="chattext" class="authorColors"></div>
<div id="chatinputbox">
<form>
<input id="chatinput" type="text" maxlength="140">
<input id="chatinput" type="text" maxlength="999">
</form>
</div>
</div>