mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-18 20:24:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
This commit is contained in:
Egil Moeller 2012-05-29 21:26:12 +02:00
commit 15a7d24450
32 changed files with 375 additions and 1962 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/static/css/admin.css
View file

@ -1,6 +1,5 @@
body {
margin: 0;
height: 100%;
color: #333;
font: 14px helvetica, sans-serif;
background: #ddd;
@ -26,7 +25,7 @@ h1 {
h2 {
font-size: 24px;
}
.seperator {
.separator {
margin: 10px 0;
height: 1px;
background: #aaa;

7
src/static/css/iframe_editor.css
View file

@ -5,6 +5,13 @@
html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
span { cursor: auto; }
::selection {
background: #acf;
}
::-moz-selection {
background: #acf;
}
a { cursor: pointer !important; }
ul, ol, li {

859
src/static/css/pad.css
View file

File diff suppressed because it is too large Load diff