diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
| commit | 94c9801ac707086732cbe1a7913ef139d1cc785b (patch) | |
| tree | 4f06a75730ae688b2afe07fa9350e601d97030e8 /addons/web/static/src/css | |
| parent | 98e87a51aef5c7457c444334f3f5270cbb947ba3 (diff) | |
| parent | c09b9cb5f9a2a7825571cf803ec760f9e3983b6c (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121207081026-3edlt0698csc6gk8
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 8ced4950bc7..e7c9aba399b 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 { @@ -798,6 +798,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; @@ -2252,6 +2266,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 04d5fb07c8a..effb9d6634d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -674,9 +674,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 @@ -1791,6 +1803,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 |