diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-31 19:57:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-31 19:57:20 +0200 |
| commit | 044c0625ad4644ae7abb197433309822eccdbcdc (patch) | |
| tree | 82b63128bb463a893037e5d4ddd3581d839090e0 /addons/web_editor/static/src/css | |
| parent | bd30f262ebfc1d586d4b5d96a89a56527ef6c375 (diff) | |
| parent | 7faf72c0242353bf3049e7ded9074437ae1d7e82 (diff) | |
[MERGE] forward port of branch saas-6 up to 7faf72c
Diffstat (limited to 'addons/web_editor/static/src/css')
| -rw-r--r-- | addons/web_editor/static/src/css/snippets.css | 7 | ||||
| -rw-r--r-- | addons/web_editor/static/src/css/snippets.sass | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/css/snippets.css b/addons/web_editor/static/src/css/snippets.css index 950e5eb4e70..b4d74eecac6 100644 --- a/addons/web_editor/static/src/css/snippets.css +++ b/addons/web_editor/static/src/css/snippets.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* ---- SNIPPET EDITOR ---- {{{ */ #oe_snippets #o_left_bar, #oe_snippets #o_arrow { position: fixed; @@ -8,6 +9,10 @@ -moz-box-shadow: 0px 10px 10px -10px black inset; -webkit-box-shadow: 0px 10px 10px -10px black inset; box-shadow: 0px 10px 10px -10px black inset; + font-size: 14px; +} +#oe_snippets #o_left_bar .snippets_loading, #oe_snippets #o_arrow .snippets_loading { + color: white; } #oe_snippets #o_arrow { z-index: 1009; @@ -487,4 +492,4 @@ .move-important, .move-important * { cursor: move !important; -}
\ No newline at end of file +} diff --git a/addons/web_editor/static/src/css/snippets.sass b/addons/web_editor/static/src/css/snippets.sass index 2f042640b70..ed5bd46a525 100644 --- a/addons/web_editor/static/src/css/snippets.sass +++ b/addons/web_editor/static/src/css/snippets.sass @@ -13,6 +13,9 @@ bottom: 0 background: rgb(40,40,40) +box-shadow(0px 10px 10px -10px black inset) + font-size: 14px + .snippets_loading + color: white #o_arrow z-index: 1009 width: 24px |