diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-02-21 13:03:34 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-02-21 13:03:34 +0100 |
| commit | 28e97400d4d7300513b63c2e4ce871fcd0db620a (patch) | |
| tree | 60ca368149b3569a3cca78c8b44794d410c1ac9a /addons/web/static/src/css | |
| parent | 8da860b5bac9b62859cbd8507e0c2e6897d9a99f (diff) | |
| parent | 5e09c5c36134d81b12ab075cf7fff9ba4a207997 (diff) | |
[FWD] [MERGE] Foward port of web-7.0 until rev 3771.
bzr revid: tde@openerp.com-20130221120334-l9rqz3g28nb655yu
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 9 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6cfee50d6a4..be26b7edd70 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"); @@ -1415,7 +1415,13 @@ display: inline-block; overflow: hidden; } +.openerp .oe_view_manager { + display: table; + height: inherit; + width: 100%; +} .openerp .oe_view_manager .oe_view_manager_body { + display: table-row; height: inherit; } .openerp .oe_view_manager .oe_view_manager_view_kanban { @@ -3089,7 +3095,6 @@ } .kitten-mode-activated { - background-image: url(http://placekitten.com/g/1365/769); 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 b4665808caf..b308b825775 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1137,7 +1137,11 @@ $sheet-padding: 16px // }}} // ViewManager common {{{ .oe_view_manager + display: table + height: inherit + width: 100% .oe_view_manager_body + display: table-row height: inherit .oe_view_manager_view_kanban height: inherit @@ -2436,7 +2440,6 @@ $sheet-padding: 16px // }}} // Kitten Mode {{{ .kitten-mode-activated - background-image: url(http://placekitten.com/g/1365/769) background-size: cover background-attachment: fixed >* |