diff options
| author | ddm <ddm@openerp.com> | 2013-09-10 15:58:01 +0200 |
|---|---|---|
| committer | ddm <ddm@openerp.com> | 2013-09-10 15:58:01 +0200 |
| commit | 54b461b4a3d21fdd7775e2348981ac09840a276e (patch) | |
| tree | 69ebb1bf63eba997bde27c9e195743e6f06e70c8 /addons/website/static/src/css/editor.sass | |
| parent | 7b2d8017b29feabed56aeeb6fabac557cf40f147 (diff) | |
| parent | 0e82448ed8adc54a73fd01046e7e5c4225b2bdd4 (diff) | |
Merged trunk-website-ace-ddm
bzr revid: ddm@openerp.com-20130910135801-wlp5u4zvna2q5228
Diffstat (limited to 'addons/website/static/src/css/editor.sass')
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index e4edcd3c62e..8c32d4222f5 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -98,12 +98,15 @@ 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 @@ -112,10 +115,10 @@ table.editorbar-panel width: 120px height: 120px border-radius: 3px - margin: 10px + margin: 8px margin-right: 0px position: relative - box-shadow: 0px 3px 10px rgba(0,0,0,0.2) + box-shadow: 0px 3px 8px rgba(0,0,0,0.2) overflow: hidden -webkit-user-select: none user-select: none |