diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-11 15:31:04 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-11 15:31:04 +0200 |
| commit | 0739bc4edabab7e74571087c01a2da68ccadb10e (patch) | |
| tree | dae48480436a1e225867bb2d41852427dac087f2 /addons/web/static/src/css | |
| parent | 7c647ec8768845d387da3bc3792b338b9144b395 (diff) | |
| parent | 7ecaab9fe277b8442eb1bee2c8e91d4211387284 (diff) | |
[MERGE] forward port of branch saas-4 up to 7ecaab9
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c71a22cf24e..b120874fc8c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -8,7 +8,6 @@ font-weight: normal; font-style: normal; } - @font-face { font-family: "EntypoRegular"; src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); @@ -19,7 +18,6 @@ font-weight: normal; font-style: normal; } - .openerp { padding: 0; margin: 0; @@ -1366,6 +1364,9 @@ .openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header { display: none; } +.openerp .oe_popup_form { + display: table; +} .openerp .oe_popup_form .oe_formview .oe_form_pager { display: none !important; } @@ -3087,7 +3088,6 @@ 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 151d695d22e..6250d112fb2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1134,6 +1134,7 @@ $sheet-padding: 16px // }}} // FormPopup {{{ .oe_popup_form + display: table .oe_formview .oe_form_pager display: none !important // Customize label weight for popup wizard appear from another wizard according bootstrap3 |