summaryrefslogtreecommitdiffstats
path: root/etherpad/src/static
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-02-16 04:08:00 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2010-02-16 04:08:00 +0100
commit7dcede70796f204384be12788192e9a2fa067540 (patch)
tree23c5d581c12b1a4bfa8750f8874b9ebcfdcdc037 /etherpad/src/static
parent6fb20c578f97c66125122ff9a71751a946083328 (diff)
downloadetherpad-7dcede70796f204384be12788192e9a2fa067540.tar.gz
etherpad-7dcede70796f204384be12788192e9a2fa067540.tar.bz2
etherpad-7dcede70796f204384be12788192e9a2fa067540.zip
display h1,h2,h3,h4,h5,h6 as inline
Diffstat (limited to 'etherpad/src/static')
-rw-r--r--etherpad/src/static/css/broadcast.css5
-rw-r--r--etherpad/src/static/css/pad2_ejs.css6
2 files changed, 5 insertions, 6 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; }