diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-16 16:04:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-16 16:04:39 +0200 |
| commit | 52fee2811d658031a34257b911b1d2b40bfa0c04 (patch) | |
| tree | 61a625efad5e5ffe237e712bf1db2a840b71cb4a /addons/web/static/src/css | |
| parent | 904adc8b51abd3a0fc29c979884f845d6641da3c (diff) | |
| parent | 2b192bef2242c71d0ff3a45b9efb9e717fd364c4 (diff) | |
[MERGE] forward port of branch 8.0 up to 2b192be
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 8 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1fdae301b99..23fb4ed2f09 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -8,6 +8,7 @@ font-weight: normal; font-style: normal; } + @font-face { font-family: "EntypoRegular"; src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); @@ -18,6 +19,7 @@ font-weight: normal; font-style: normal; } + #oe_main_menu_navbar { min-height: 34px; z-index: 1001; @@ -741,11 +743,6 @@ text-decoration: none; } .openerp .oe_dropdown_arrow:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; vertical-align: top; margin-top: 8px; margin-left: 3px; @@ -3025,6 +3022,7 @@ top: 0px; } } + .kitten-mode-activated { background-size: cover; background-attachment: fixed; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 13be06043da..a8efd0f29cb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -645,11 +645,6 @@ $sheet-padding: 16px &:hover text-decoration: none .oe_dropdown_arrow:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px vertical-align: top margin-top: 8px //margin-left set at 3px to avoid a strange overflow |