odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Ace editor CSS improvements 

bzr revid: ddm@openerp.com-20131016092852-3myx024u2zn5cnvi
This commit is contained in:
ddm 2013-10-16 11:28:52 +02:00
parent e375557b84
commit 52ef0032e3
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/website/static/src/css/editor.css
View File

@ -612,20 +612,20 @@ table.editorbar-panel td.selected {
}
.oe_ace_view_editor .oe_ace_view_editor_title {
width: 100%;
padding-top: 4px;
padding-left: 4px;
height: 40px;
padding-top: 0;
padding-left: 0;
height: 30px;
background: #2f3129;
}
.oe_ace_view_editor .oe_ace_view_editor_title .oe_view_list {
width: 50%;
height: 32px;
height: 30px;
font-size: 14px;
font-family: "Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace;
line-height: normal;
}
.oe_ace_view_editor .oe_ace_view_editor_title .btn {
height: 32px;
height: 30px;
padding: 0 4px 0 4px;
font-size: 14px;
font-family: "Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace;
@ -633,7 +633,7 @@ table.editorbar-panel td.selected {
}
.oe_ace_view_editor .ace_editor {
position: absolute;
top: 40px;
top: 30px;
right: 0;
bottom: 51px;
left: 0;
@ -644,6 +644,7 @@ table.editorbar-panel td.selected {
opacity: 1;
}
.oe_ace_view_editor.oe_ace_closed {
z-index: -1000;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
}

11
addons/website/static/src/css/editor.sass
View File

@ -467,7 +467,7 @@ $highlighted_text_color: #ffffff
/* ---- ACE EDITOR ---- */
$ace_width: 720px
$editorbar_height: 40px
$editorbar_height: 30px
// TODO Fix => might break with themes
$navbar_height: 51px
@ -484,16 +484,16 @@ $navbar_height: 51px
width: $ace_width
.oe_ace_view_editor_title
width: 100%
padding-top: 4px
padding-left: 4px
padding-top: 0
padding-left: 0
height: $editorbar_height
background: #2F3129
.oe_view_list
width: 50%
height: $editorbar_height - 8px
height: $editorbar_height
@include editor-font
.btn
height: $editorbar_height - 8px
height: $editorbar_height
padding: 0 4px 0 4px
@include editor-font
.ace_editor
@ -506,6 +506,7 @@ $navbar_height: 51px
&.oe_ace_open
+opacity(1)
&.oe_ace_closed
z-index: -1000
+opacity(0)
/* ---- EDITOR TOUR ---- */

4
addons/website/static/src/js/website.ace.js
View File

@ -93,7 +93,7 @@
self.open.call(self);
});
var $editor = $('.ace_editor');
var $editor = self.$('.ace_editor');
function resizeEditor (target) {
var width = Math.min(document.body.clientWidth, Math.max(parseInt(target, 10), self.minWidth));
$editor.width(width);
@ -108,7 +108,7 @@
self.resizing = false;
}
function updateWidth (e) {
if (self.resizing) {
if (self.resizing) {
var offset = e.pageX - self.refX;
var width = self.$el.width() - offset;
self.refX = e.pageX;