diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-01-08 18:53:25 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-01-08 18:53:25 +0100 |
| commit | c8fa4b1641eaaf677ccbbf7a953a1d8545b03283 (patch) | |
| tree | a1fc68668b4d44130dc162243bc63928752b2f91 | |
| parent | b9a182ff1aecdd5000605ee443a74b5e07a351ff (diff) | |
| parent | 86b7bdeed025cb2acd0150b998a56ced81b005d5 (diff) | |
[MERGE] css improvements for etherpad and notes
bzr revid: fva@openerp.com-20130108175325-4d4kw7i6t18oox5b
| -rw-r--r-- | addons/pad/static/src/css/etherpad.css | 21 |
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; } |