diff options
| author | Minh Tran <mit@openerp.com> | 2012-08-17 16:29:17 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-08-17 16:29:17 +0200 |
| commit | f4723d16d03a2a1e4a759c37bdf2a3cf820ecd50 (patch) | |
| tree | 38453efb221255b189598d29cfe490539c61b8d1 /addons/web/static/src/css/base.sass | |
| parent | e1cd3289092ec9da8a20b7efa666357075d4c97e (diff) | |
| parent | 86f04a8726eb4a9e838a3a2fe3a0953b45a2fe28 (diff) | |
merge mit-trunk
bzr revid: mit@openerp.com-20120817142917-31iuftau2gwno9e8
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7055f867b36..4c190549639 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,13 +2,13 @@ // Variables {{{ $facets-border: #afafb6 -$section-title-color: #8786b7 +$section-title-color: #7C7BAD $tag-bg-light: #f0f0fa -$tag-bg-dark: #8786b7 +$tag-bg-dark: #7C7BAD $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$link-color: #8a89ba +$link-color: #7C7BAD $sheet-max-width: 860px // }}} // Mixins {{{ @@ -1502,9 +1502,9 @@ $sheet-max-width: 860px width: auto .oe_form_nosheet margin: 16px - .oe_form_nosheet > header - margin: -16px -16px 0 -16px - padding: 8px + > header + margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1512,7 +1512,7 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - //line-height: 30px +>>>>>>> MERGE-SOURCE ul display: inline-block float: right |