diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-02-16 04:08:00 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-02-16 04:08:00 +0100 |
| commit | 7dcede70796f204384be12788192e9a2fa067540 (patch) | |
| tree | 23c5d581c12b1a4bfa8750f8874b9ebcfdcdc037 | |
| parent | 6fb20c578f97c66125122ff9a71751a946083328 (diff) | |
| download | etherpad-7dcede70796f204384be12788192e9a2fa067540.tar.gz etherpad-7dcede70796f204384be12788192e9a2fa067540.tar.xz etherpad-7dcede70796f204384be12788192e9a2fa067540.zip | |
display h1,h2,h3,h4,h5,h6 as inline
| -rw-r--r-- | etherpad/src/static/css/broadcast.css | 5 | ||||
| -rw-r--r-- | etherpad/src/static/css/pad2_ejs.css | 6 | ||||
| -rw-r--r-- | infrastructure/ace/www/editor.css | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/etherpad/src/static/css/broadcast.css b/etherpad/src/static/css/broadcast.css index dd4b651..a746503 100644 --- a/etherpad/src/static/css/broadcast.css +++ b/etherpad/src/static/css/broadcast.css @@ -1,6 +1,5 @@ -*,html.body,p { margin: 0; padding: 0; } -h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; font-style: normal; - text-decoration: none; margin: 0; padding: 0; } +*,html.body { margin: 0; padding: 0; } +h1, h2, h3, h4, h5, h6 { display: inline; } .clear { clear: both; } diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 3413c34..ee38441 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -1,7 +1,7 @@ -*,html.body,p { margin: 0; padding: 0; } -h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; font-style: normal; - text-decoration: none; margin: 0; padding: 0; } +*,html.body { margin: 0; padding: 0; } + +h1, h2, h3, h4, h5, h6 { display: inline; } .clear { clear: both; } diff --git a/infrastructure/ace/www/editor.css b/infrastructure/ace/www/editor.css index 0a43478..b15af14 100644 --- a/infrastructure/ace/www/editor.css +++ b/infrastructure/ace/www/editor.css @@ -6,7 +6,11 @@ body { margin: 0; white-space: nowrap; -} +} + +h1,h2,h3,h4,h5,h6 { + display: inline; +} #outerdocbody { background-color: #fff; @@ -106,4 +110,4 @@ p { font-family: monospace; /* overridden by lineMetricsDiv.style */ } -#overlaysdiv { position: absolute; left: -1000px; top: -1000px; }
\ No newline at end of file +#overlaysdiv { position: absolute; left: -1000px; top: -1000px; } |