mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 10:26:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

17
src/static/css/pad.css
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;

4
src/static/js/pad_editor.js
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);