diff options
| author | stefanorigano <sri@odoo.com> | 2017-09-06 15:56:25 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-09-07 16:36:29 +0200 |
| commit | af130256e3e1b1491bd33b276fe1b40f7b74e6fa (patch) | |
| tree | 7b4352b4c2708e798f58def149aa5952a508c449 /addons/web/static/src | |
| parent | 9ec47d37357382bc62933fbcc4fbfe524a673c42 (diff) | |
[REF] web, mail: review silver colors
This is also meant to solve a bug in firefox: the scrollbar was the
same color as the background by bad luck.
+ Adapt kanban view borders
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/less/bootstrap_overridden.less | 1 | ||||
| -rw-r--r-- | addons/web/static/src/less/form_view.less | 4 | ||||
| -rw-r--r-- | addons/web/static/src/less/kanban_view.less | 31 | ||||
| -rw-r--r-- | addons/web/static/src/less/variables.less | 4 |
4 files changed, 27 insertions, 13 deletions
diff --git a/addons/web/static/src/less/bootstrap_overridden.less b/addons/web/static/src/less/bootstrap_overridden.less index 1f3f22cac3a..25c34229191 100644 --- a/addons/web/static/src/less/bootstrap_overridden.less +++ b/addons/web/static/src/less/bootstrap_overridden.less @@ -13,6 +13,7 @@ // purposes only (e.g. cards' borders). We avoid to overwrite the default // @gray-light because it is deeply used by bootstrap to define muted elements. @gray-lighter-dark: @odoo-color-silver-dark; +@gray-lighter-darker: @odoo-color-silver-darker; //== Titles @font-size-h1: @odoo-font-size-base + 13px; diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less index 55fbc2ce54b..27b63fa9090 100644 --- a/addons/web/static/src/less/form_view.less +++ b/addons/web/static/src/less/form_view.less @@ -153,7 +153,7 @@ .o-flex-display(); .o-justify-content(space-between); padding-left: @odoo-horizontal-padding; - border-bottom: 1px solid @gray-lighter-dark; + border-bottom: 1px solid @gray-lighter-darker; background-color: @odoo-view-background-color; > .o_statusbar_buttons, > .o_statusbar_status { @@ -199,7 +199,7 @@ } &:last-child { padding-left: @odoo-horizontal-padding - 1; - border-left: 1px solid @gray-lighter-dark; + border-left: 1px solid @gray-lighter-darker; } &:active { diff --git a/addons/web/static/src/less/kanban_view.less b/addons/web/static/src/less/kanban_view.less index b6ab935396d..018f6289054 100644 --- a/addons/web/static/src/less/kanban_view.less +++ b/addons/web/static/src/less/kanban_view.less @@ -89,12 +89,13 @@ .o-kanban-dropdown-open() { position: relative; background: white; - border-color: @gray-lighter-dark; + border-color: @gray-lighter-darker; z-index: 2; // Make the dropdown link appear over the dropdown-menu } .o-kanban-dropdown-menu() { .o-position-absolute(@right: -1px); margin-top: -1px; + border-color: @gray-lighter-darker; z-index: 1; // Make the dropdown-menu appear under the dropdown link } .o-kanban-colorpicker() { @@ -171,6 +172,7 @@ .o_kanban_record { position: relative; display: inline-block; // Force the creation of a block formatting context to clear float items + border-color: @gray-lighter-darker; min-width: 150px; margin: 0 @o-kanban-record-margin -1px; @@ -178,7 +180,7 @@ // Records colours &::after { content: ""; - .o-position-absolute(0, auto, 0, 0); + .o-position-absolute(0, auto, 0, -1px); width: @o-kanban-color-border-width; } @@ -371,7 +373,7 @@ &.ui-sortable-helper { .o-transform(rotate(-3deg)); - box-shadow: 0 10px 25px -15px black; + box-shadow: 0 5px 25px -10px black; .transition(~"transform 0.6s, box-shadow 0.3s"); } @@ -457,13 +459,16 @@ &.o_kanban_grouped { min-height: 100%; padding: 0 @odoo-horizontal-padding - @o-kanban-group-padding - @o-kanban-record-margin; - .o_kanban_record { + background-color: @gray-lighter; + + .o_kanban_record, .o_kanban_quick_create { width: @o-kanban-default-record-width; } + &.o_kanban_small_column .o_kanban_group { &:not(.o_column_folded) { width: @o-kanban-small-record-width + 2*@o-kanban-group-padding + 2*@o-kanban-record-margin; - .o_kanban_record { + .o_kanban_record, .o_kanban_quick_create { width: @o-kanban-small-record-width; } } @@ -474,6 +479,10 @@ .o_kanban_group { .o-flex(0, 0, auto); padding: 0 @o-kanban-group-padding; + border: 1px solid @gray-lighter-dark; + background-color: @gray-lighter; + border-width: 0 1px; + margin-left: -1px; .o_kanban_header { .o-kanban-header(); @@ -482,7 +491,8 @@ .o-flex(1, 1, auto); padding-top: 5px; .o-text-overflow(); - font-size: 18px; + font-size: 16px; + font-weight: 500; } .o_column_unfold { @@ -517,7 +527,7 @@ } &.ui-sortable-helper { - box-shadow: 0 0 40px -10px black; + box-shadow: 0 0 30px -10px black; } &:not(.o_column_folded) { @@ -540,8 +550,11 @@ // Kanban Grouped Layout - Column Folded .o_kanban_group.o_column_folded { .o-kanban-slim-col(); - margin-left: 1px; - background-color: darken(@gray-lighter-dark, 2%); + background-color: @gray-lighter-dark; + + & + .o_kanban_group.o_column_folded { + margin-left: 1px; + } .o_kanban_header { position: relative; diff --git a/addons/web/static/src/less/variables.less b/addons/web/static/src/less/variables.less index 038ad1db95f..cc3f5b66ab9 100644 --- a/addons/web/static/src/less/variables.less +++ b/addons/web/static/src/less/variables.less @@ -13,7 +13,7 @@ @odoo-brand-lightsecondary: #e2e2e0; @odoo-color-silver: #F9F9F9; @odoo-color-silver-dark: #E5E5E5; -@odoo-color-silver-darker: #E8E7E7; +@odoo-color-silver-darker: #d9d7d7; @odoo-color-pink: #875A7B; @odoo-main-color-muted: #a8a8a8; @@ -22,7 +22,7 @@ @odoo-view-background-color: white; @odoo-shadow-color: #303030; -@odoo-webclient-background-color: @odoo-color-silver-darker; +@odoo-webclient-background-color: @odoo-color-silver; @odoo-control-panel-background-color: @odoo-color-silver; @odoo-form-lightsecondary: #ccc; |
