diff options
| author | Minh Tran <mit@openerp.com> | 2012-08-28 13:11:20 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-08-28 13:11:20 +0200 |
| commit | 2efa00ddc35f1fc614c3f615954a0965b75899de (patch) | |
| tree | d25151421c21981600bbd28d22225698ee3d821c /addons/web/static/src/css | |
| parent | decab66e70d67e197c406f307baa366327ec105b (diff) | |
| parent | 4e31d1be931a6b9c6152a152ef044e4141a5dc7b (diff) | |
merge from trunk
bzr revid: mit@openerp.com-20120828111018-hyfqufalm9jukcxh
bzr revid: mit@openerp.com-20120828111120-205x3qtpkrwoa5vs
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 16 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 13 |
2 files changed, 24 insertions, 5 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ff90d0050ec..908d407380c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -493,8 +493,8 @@ margin: 4px; } .openerp .oe_avatar > img { - height: 90px; - max-width: 100px; + max-height: 90px; + max-width: 90px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -2725,6 +2725,16 @@ float: right; color: #333333; } +.openerp .oe_semantic_html li { + list-style-type: disc; + display: list-item; +} +.openerp .oe_semantic_html ul { + padding-left: 1em; +} +.openerp .oe_semantic_html p { + color: #4c4c4c !important; +} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2bcd5ac5be4..52d54de3fbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -417,8 +417,8 @@ $sheet-max-width: 860px margin: 4px .oe_avatar > img - height: 90px - max-width: 100px + max-height: 90px + max-width: 90px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none @@ -2126,6 +2126,15 @@ $sheet-max-width: 860px float: right color: #333 // }}} + .oe_semantic_html // a style to use normal html + li + list-style-type: disc + display: list-item + ul + padding-left: 1em + p + color: #4C4C4C !important + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) |