From 66701258f70ebb3c54550f593ddb1dee18f1e982 Mon Sep 17 00:00:00 2001 From: stefanorigano Date: Fri, 11 Aug 2017 14:53:45 +0200 Subject: [PATCH 1/3] [REF] web: introduce new form-view layout --- addons/web/static/src/less/form_view.less | 42 +++++++++++++---------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less index c87b0385554..c1e6077a0d6 100644 --- a/addons/web/static/src/less/form_view.less +++ b/addons/web/static/src/less/form_view.less @@ -135,7 +135,7 @@ .o-flex-display(); .o-justify-content(space-between); padding-left: @odoo-horizontal-padding; - border-bottom: 1px solid @odoo-brand-secondary; + border-bottom: 1px solid @gray-lighter-dark; background-color: @odoo-view-background-color; > .o_statusbar_buttons, > .o_statusbar_status { @@ -153,7 +153,9 @@ .o-flex-flow(row, wrap); > .btn { - margin: 2px 3px 2px 0; + margin-right: 3px; + padding-top: 2px; + padding-bottom: 2px; } } @@ -169,15 +171,17 @@ font-weight: bold; position: relative; padding-left: @odoo-statusbar-arrow-width*2; - color: @odoo-main-color-muted; - .o-transition(all, 0.2s); + color: @gray; + border-width: 0 0 0; + border-radius: 0; + .o-transition(all, 0.1s); &:first-child { padding-right: @odoo-horizontal-padding; // Compensate container padding } &:last-child { padding-left: @odoo-horizontal-padding - 1; - border-left: 1px solid @odoo-brand-lightsecondary; + border-left: 1px solid @gray-lighter-dark; } &:active { @@ -186,16 +190,14 @@ &.disabled { opacity: 1.0; - cursor: auto; - pointer-events: auto; - color: @odoo-main-text-color; - border-left: 1px solid @odoo-brand-lightsecondary; + color: @text-muted; + border-left: 1px solid @gray-lighter-dark; } &:before, &:after { content: " "; display: block; - .o-position-absolute(0, -@odoo-statusbar-arrow-width + 1); + .o-position-absolute(0, -@odoo-statusbar-arrow-width); border-top: @odoo-statusbar-height/2 solid transparent; border-bottom: @odoo-statusbar-height/2 solid transparent; @@ -207,25 +209,29 @@ &:not(.disabled) { &:hover, &:active, &:focus { - color: white; - background-color: @odoo-brand-optional; + color: @odoo-brand-optional; + background-color: @gray-lighter; + &:after { - border-left-color: @odoo-brand-optional; + border-left-color: @gray-lighter; } } } &:before { - right: -@odoo-statusbar-arrow-width; - border-left-color: @odoo-brand-lightsecondary; + right: -@odoo-statusbar-arrow-width - 1px; + border-left-color: @gray-lighter-dark; } &.btn-primary.disabled { - color: @text-color; - background-color: @odoo-brand-lightsecondary; + color: @odoo-brand-primary; + font-size: 11px; + background-color: @gray-lighter; + box-shadow: inset 0 5px 7px -8px @gray-darker; + cursor: default; &:after { - border-left-color: @odoo-brand-lightsecondary; + border-left-color: @gray-lighter; } } } From 6b6651be869706947cbcfb61d00e9a958fb80e5d Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 31 Aug 2017 15:53:53 +0200 Subject: [PATCH 2/3] [FIX] web: properly display statusbar arrows --- addons/web/static/src/less/form_view.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less index c1e6077a0d6..96dad7e4de7 100644 --- a/addons/web/static/src/less/form_view.less +++ b/addons/web/static/src/less/form_view.less @@ -197,10 +197,10 @@ &:before, &:after { content: " "; display: block; - .o-position-absolute(0, -@odoo-statusbar-arrow-width); + .o-position-absolute(0, -@odoo-statusbar-arrow-width + 1); - border-top: @odoo-statusbar-height/2 solid transparent; - border-bottom: @odoo-statusbar-height/2 solid transparent; + border-top: floor(@odoo-statusbar-height/2) solid transparent; + border-bottom: ceil(@odoo-statusbar-height/2) solid transparent; border-right: none; border-left: @odoo-statusbar-arrow-width solid @odoo-view-background-color; .o-transition(border, 0.2s); @@ -219,7 +219,7 @@ } &:before { - right: -@odoo-statusbar-arrow-width - 1px; + right: -@odoo-statusbar-arrow-width; border-left-color: @gray-lighter-dark; } @@ -227,7 +227,6 @@ color: @odoo-brand-primary; font-size: 11px; background-color: @gray-lighter; - box-shadow: inset 0 5px 7px -8px @gray-darker; cursor: default; &:after { From b781565e360a306b0a0478f245c804509e97fbf6 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 31 Aug 2017 15:54:55 +0200 Subject: [PATCH 3/3] [REF] web: allow to distinguish kanban/list x2m in LESS --- addons/web/static/src/js/fields/relational_fields.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index d70071b2fec..5c2b1795e9f 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -715,16 +715,19 @@ var FieldX2Many = AbstractField.extend({ return $.when(); } var arch = this.view.arch; + var viewType; if (arch.tag === 'tree') { + viewType = 'list'; this.renderer = new ListRenderer(this, this.value, { arch: arch, mode: this.mode, addCreateLine: !this.isReadonly && this.activeActions.create, addTrashIcon: !this.isReadonly && this.activeActions.delete, - viewType: 'list', + viewType: viewType, }); } if (arch.tag === 'kanban') { + viewType = 'kanban'; var record_options = { editable: false, deletable: false, @@ -733,9 +736,10 @@ var FieldX2Many = AbstractField.extend({ this.renderer = new KanbanRenderer(this, this.value, { arch: arch, record_options: record_options, - viewType: 'kanban', + viewType: viewType, }); } + this.$el.addClass('o_field_x2many o_field_x2many_' + viewType); return this.renderer ? this.renderer.appendTo(this.$el) : this._super(); }, /**