summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorFrédéric van der Essen <fva@openerp.com>2013-01-08 18:20:57 +0100
committerFrédéric van der Essen <fva@openerp.com>2013-01-08 18:20:57 +0100
commite40eeedf3e366254dea4a4a0101efe557aaac7a2 (patch)
tree7aac1d040c2be24fef5bad7b537c6ad6ca4b0935 /addons
parentff5b5d6cb1007bca42d7b7073350a771984c7c5c (diff)
[IMP] css: made the styling of the note's content constistant with the styling of the etherpad editor
bzr revid: fva@openerp.com-20130108172057-8xmwdhfg3izkqbdf
Diffstat (limited to 'addons')
-rw-r--r--addons/pad/static/src/css/etherpad.css21
1 files changed, 14 insertions, 7 deletions
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index 381b4eeffec..ad47be32b02 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -74,11 +74,9 @@
}
.etherpad_readonly ul, .etherpad_readonly ol {
- margin-before: 1em;
- margin-after: 1em;
- margin-start: 0px;
- margin-end: 0px;
- padding-start: 40px !important;
+ margin: 0;
+ margin-left: 1.5em;
+ padding: 0;
}
.etherpad_readonly ul li{
list-style-type: disc;
@@ -92,8 +90,8 @@
.etherpad_readonly{
font-family: arial, sans-serif;
- font-size: 13px;
- line-height: 18px;
+ font-size: 15px;
+ line-height: 19px;
}
.openerp .oe_form_nomargin .etherpad_readonly{
@@ -109,3 +107,12 @@
.etherpad_readonly ol ol ol ol ol ol li{ list-style-type: lower-roman !important; }
.etherpad_readonly ol ol ol ol ol ol ol li{ list-style-type: decimal !important; }
.etherpad_readonly ol ol ol ol ol ol ol ol li{ list-style-type: lower-latin !important; }
+.etherpad_readonly ul li { list-style-type: disc !important; }
+.etherpad_readonly ul ul li { list-style-type: circle !important; }
+.etherpad_readonly ul ul ul li { list-style-type: square !important; }
+.etherpad_readonly ul ul ul ul li { list-style-type: disc !important; }
+.etherpad_readonly ul ul ul ul ul li { list-style-type: circle !important; }
+.etherpad_readonly ul ul ul ul ul ul li { list-style-type: square !important; }
+.etherpad_readonly ul ul ul ul ul ul ul li { list-style-type: disc !important; }
+.etherpad_readonly ul ul ul ul ul ul ul ul li { list-style-type: circle !important; }
+.etherpad_readonly ul ul ul ul ul ul ul ul ul li { list-style-type: square !important; }