diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-08-26 11:17:03 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-08-26 11:17:03 +0200 |
| commit | e3a472170c1d67cd0c72294286a981b2c68b480e (patch) | |
| tree | 689053a1cd6f2149570ed3bdfa3853d0db211717 /addons/website/static/src/css | |
| parent | 84c0d68140d8df769c66b917b1c60e4ef8ab4e48 (diff) | |
| parent | 5a90cb546dad2e4ef33f1384543d8e2fc7e040c9 (diff) | |
[MERGE] from upstream
bzr revid: fva@openerp.com-20130826091703-qmipfeith2arjyr8
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 17 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 17 |
2 files changed, 26 insertions, 8 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index cd9ecc8f8a0..8f810f328d6 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -164,6 +164,7 @@ background-color: black; border: 2px solid; border-radius: 10px; + border-color: #1a1a1a; margin: auto; top: 0; left: 0; @@ -171,17 +172,24 @@ right: 0; max-width: 330px; } - -#mobile-preview .modal-header { +#mobile-preview.modal .modal-header { + background-color: black; border-bottom: 0; border-top-left-radius: 10px; border-top-right-radius: 10px; } -#mobile-preview .modal-body { +#mobile-preview.modal .modal-header .oe_mobile_preview_title { + color: #1a1a1a; +} +#mobile-preview.modal .modal-body { + background-color: black; max-height: 600px; padding: 0; margin: 0; } +#mobile-preview.modal .modal-footer { + background-color: black; +} .oe_mobile_viewport { width: 320px; @@ -195,5 +203,6 @@ opacity: 1; } .oe_mobile_preview_header .close:hover { - color: darkgrey; + color: #e00101; + opacity: 1; } diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 3c54a0d0aaf..9ac81414eba 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -140,27 +140,35 @@ height: 100% overflow: hidden +$mobile_preview_background: #000000 +$mobile_preview_border: #1A1A1A +$mobile_preview_close: #E00101 #mobile-preview.modal height: 660px - background-color: black + background-color: $mobile_preview_background border: 2px solid border-radius: 10px + border-color: $mobile_preview_border margin: auto top: 0 left: 0 bottom: 0 right: 0 max-width: 330px - -#mobile-preview .modal-header + background-color: $mobile_preview_background border-bottom: 0 border-top-left-radius: 10px border-top-right-radius: 10px + .oe_mobile_preview_title + color: $mobile_preview_border .modal-body + background-color: $mobile_preview_background max-height: 600px padding: 0 margin: 0 + .modal-footer + background-color: $mobile_preview_background .oe_mobile_viewport width: 320px @@ -173,4 +181,5 @@ color: lightgrey opacity: 1 .close:hover - color: darkgrey + color: $mobile_preview_close + opacity: 1 |