diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2013-09-10 17:40:24 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2013-09-10 17:40:24 +0200 |
| commit | f80717d3e52838b3142c783e587b7383ef7fc78d (patch) | |
| tree | e377c49fc0d31016acde75191b2256f1638f58ea /addons/website/static/src/css | |
| parent | 95a9983f666a1f8e8da4cb57ec82db6acddd7e3e (diff) | |
[UNDO] revert change as snippets moved to client side
bzr revid: fp@tinyerp.com-20130910154024-qc1h6ha7hmocu2fj
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 14 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 11 |
2 files changed, 8 insertions, 17 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index a2f322f1b84..844cea11d9f 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -106,18 +105,13 @@ table.editorbar-panel td.selected { left: 0px; right: 0px; bottom: 0px; + max-height: 280px; + min-height: 140px; background: #282828; box-shadow: 0px 10px 10px -10px black inset; overflow-y: auto; z-index: 100; } -.oe_snippets .nav-pills { - padding: 3px 8px; - background: #444444; -} -.oe_snippets .nav-pills > li > a { - padding: 2px 10px !important; -} .oe_snippet { display: inline-block; @@ -126,10 +120,10 @@ table.editorbar-panel td.selected { width: 120px; height: 120px; border-radius: 3px; - margin: 8px; + margin: 10px; margin-right: 0px; position: relative; - box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2); + box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.2); overflow: hidden; -webkit-user-select: none; user-select: none; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 8c32d4222f5..e4edcd3c62e 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -98,15 +98,12 @@ table.editorbar-panel left: 0px right: 0px bottom: 0px + max-height: 280px + min-height: 140px background: rgb(40,40,40) box-shadow: 0px 10px 10px -10px black inset overflow-y: auto z-index: 100 - .nav-pills - padding: 3px 8px - background: #444 - > li > a - padding: 2px 10px !important .oe_snippet display: inline-block @@ -115,10 +112,10 @@ table.editorbar-panel width: 120px height: 120px border-radius: 3px - margin: 8px + margin: 10px margin-right: 0px position: relative - box-shadow: 0px 3px 8px rgba(0,0,0,0.2) + box-shadow: 0px 3px 10px rgba(0,0,0,0.2) overflow: hidden -webkit-user-select: none user-select: none |