summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2013-12-18 18:39:15 +0100
committerFabien Meghazi <fme@openerp.com>2013-12-18 18:39:15 +0100
commit9abcc28884688bd251c5a9de77b3afda11dcec90 (patch)
tree7c36a5a4d2f35b8115956505173e73d6109a0a87 /addons/website/static/src/css
parent2381c444413593de969900b41a6e4be56e8c17b3 (diff)
[IMP] Set EditorBar height programmatically
bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/editor.css3
-rw-r--r--addons/website/static/src/css/editor.sass7
2 files changed, 3 insertions, 7 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index e21bfc1fbe8..3e0e46ebc45 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -238,7 +238,6 @@ ul.oe_menu_editor .disclose {
position: fixed;
left: 0px;
right: 0px;
- top: 51px;
background: #282828;
-webkit-box-shadow: 0px 10px 10px -10px black inset;
-moz-box-shadow: 0px 10px 10px -10px black inset;
@@ -677,7 +676,6 @@ ul.oe_menu_editor .disclose {
/* ---- ACE EDITOR ---- */
.oe_ace_view_editor {
position: fixed;
- top: 51px;
right: 0;
z-index: 1000;
height: 100%;
@@ -707,7 +705,6 @@ ul.oe_menu_editor .disclose {
position: absolute;
top: 30px;
right: 0;
- bottom: 51px;
left: 0;
}
.oe_ace_view_editor .ace_editor .ace_gutter {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ff62f416d8d..031dd85c9f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -203,7 +203,7 @@ ul.oe_menu_editor
position: fixed
left: 0px
right: 0px
- top: 51px
+ // top property is set programmatically
background: rgb(40,40,40)
+box-shadow(0px 10px 10px -10px black inset)
z-index: 1010
@@ -520,11 +520,10 @@ $highlighted_text_color: #ffffff
$editorbar_height: 30px
// TODO Fix => might break with themes
-$navbar_height: 51px
.oe_ace_view_editor
position: fixed
- top: $navbar_height
+ // top property is set programmatically
right: 0
z-index: 1000
height: 100%
@@ -546,7 +545,7 @@ $navbar_height: 51px
position: absolute
top: $editorbar_height
right: 0
- bottom: $navbar_height
+ // bottom property is set programmatically
left: 0
.ace_gutter
cursor: ew-resize