pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor, website: review responsiveness/style of ace editor

Browse Source
This commit is contained in:
qsm-odoo
2016-09-13 14:43:50 +02:00
parent 142b177c5c
commit ad930d5208
2 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/xml/ace.xml
+10 -7
View File
@@ -4,15 +4,18 @@
<t t-name="web_editor.ace_view_editor">
<div class="o_ace_view_editor oe_ace_closed">
<div class="form-inline o_ace_view_editor_title">
<select id="ace-view-list" class="form-control oe_view_list">
<!-- filled in JS -->
</select>
<select id="ace-view-list" class="form-control oe_view_list"/>
<label class="oe_include_bundles">
<input type="checkbox" class="js_include_bundles"/> Include Asset Bundles
<div class="o_checkbox">
<input type="checkbox" class="js_include_bundles"/><span/>
</div>
Include Asset Bundles
</label>
<button data-action="save" type="submit" class="btn btn-success">Save</button>
<button data-action="format" type="button" class="btn btn-warning">Format</button>
<button data-action="close" type="button" class="btn btn-info">Close</button>
<div class="o_button_section">
<button data-action="save" type="submit" class="btn btn-sm btn-primary">Save</button>
<button data-action="format" type="button" class="btn btn-sm btn-default">Format</button>
<button data-action="close" type="button" class="btn btn-sm btn-default">Close</button>
</div>
</div>
<div id="ace-view-id"/>
<div id="ace-view-editor"/>
addons/website/static/src/less/website.ui.components.less
+38 -25
View File
@@ -324,39 +324,56 @@ body .modal {
// ACE EDITOR
.o_ace_view_editor {
@o-ace-color: #2F3129;
.o-position-absolute(@odoo-navbar-height, 0, 0);
position: fixed;
.o-flex-display();
.o-flex-flow(column, nowrap);
z-index: 1001;
background: #2F3129;
background: @o-ace-color;
color: white;
.o_ace_view_editor_title {
width: 100%;
height: 30px;
padding-top: 0;
padding-left: 0;
.oe_view_list, .btn {
font-size: 14px;
font-family: "Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace;
line-height: normal;
.o-flex(0, 0, auto);
.o-flex-display();
.o-align-items(center);
.o-justify-content(space-between);
padding: @grid-gutter-width/4;
> * {
.o-flex(0, 0, auto);
margin: 0 @grid-gutter-width/4;
&.oe_include_bundles {
.o-flex-display();
.o-align-items(center);
font-size: 11px;
> .o_checkbox {
margin-right: @grid-gutter-width/4;
}
}
}
.oe_view_list {
width: 50%;
height: 30px;
}
.btn {
height: 100%;
padding: 0 4px;
> select {
.o-flex(0, 1, auto);
min-width: 60px;
}
}
.ace_editor {
.o-position-absolute(50px, 0, 0, 0);
#ace-view-id {
.o-flex(0, 0, auto);
padding: @grid-gutter-width/4 @grid-gutter-width/2;
background-color: lighten(@o-ace-color, 10%);
}
#ace-view-editor {
height: 70%; // in case flex is not supported
.o-flex(1, 1, auto);
.ace_gutter {
cursor: ew-resize;
}
}
#ace-view-id {
padding: 0 1em;
}
&.oe_ace_open {
opacity: 0.97;
}
@@ -364,10 +381,6 @@ body .modal {
z-index: -1000;
opacity: 0;
}
.oe_include_bundles {
font-weight: normal;
padding: 0 8px;
}
}
// PLANNER DIALOG