diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-10 13:54:23 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-10 13:54:23 +0100 |
| commit | 1ca5e68b1f3ddb440b104c6c47ea35e8d26a1eed (patch) | |
| tree | 4070b56d1253290fa69f4fbc43ad4862c883080e /addons/web/static/src/css | |
| parent | a5ca416f055871fb2765567c2cf2f06445c1d2ca (diff) | |
| parent | 70f8f99b35c93a880cf15a1f21b7f88aef5a8d36 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121130093732-i8y10ayjqiaq5t7p
bzr revid: tde@openerp.com-20121204142854-pauouyapnw7z8zwj
bzr revid: tde@openerp.com-20121205101544-k4ui6thr0ibzw0vx
bzr revid: tde@openerp.com-20121210125423-81wbh4af9sxdqjki
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 17 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 15 |
2 files changed, 30 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a71a071db3b..0a4e2ad322f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -652,7 +652,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #4C4C4C; + color: #4c4c4c; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -795,6 +795,20 @@ .openerp .oe_notification { z-index: 1050; } +.openerp .oe_webclient_timezone_notification a { + color: white; + text-decoration: underline; +} +.openerp .oe_webclient_timezone_notification p { + margin-top: 1em; +} +.openerp .oe_webclient_timezone_notification dt { + font-weight: bold; +} +.openerp .oe_timezone_systray span { + margin-top: 1px; + background-color: #f6cf3b; +} .openerp .oe_login { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); text-align: center; @@ -2249,6 +2263,7 @@ .openerp .oe_form .oe_form_field_url button img { vertical-align: top; } +.openerp .oe_form .oe_form_field_monetary, .openerp .oe_form .oe_form_field_date, .openerp .oe_form .oe_form_field_datetime { white-space: nowrap; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f634452a7ee..e1789b0524c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -671,9 +671,21 @@ $sheet-padding: 16px border-bottom-right-radius: 8px border-bottom-left-radius: 8px // }}} - // Notification {{{ + // Notifications {{{ .oe_notification z-index: 1050 + .oe_webclient_timezone_notification + a + color: white + text-decoration: underline + p + margin-top: 1em + dt + font-weight: bold + .oe_timezone_systray + span + margin-top: 1px + background-color: #f6cf3b // }}} // Login {{{ .oe_login @@ -1788,6 +1800,7 @@ $sheet-padding: 16px border-left: 8px solid #eee .oe_form_field_url button img vertical-align: top + .oe_form_field_monetary, .oe_form_field_date, .oe_form_field_datetime white-space: nowrap |