summaryrefslogtreecommitdiff
path: root/addons/web/static/src/scss
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-07-18 16:49:32 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commit318b10cce467fea7bd5f16564ed5218c5f3d0a48 (patch)
tree3410d70cc6a66b8d64dbcfea1b2649d8c8214ca1 /addons/web/static/src/scss
parentd8c217a67d9f5b371dd43b9cff8f04aa008c27b8 (diff)
[REF] *: use 'light' color and reset 'gray' palette
See previous commit for more explanation.
Diffstat (limited to 'addons/web/static/src/scss')
-rw-r--r--addons/web/static/src/scss/bootstrap_overridden.scss23
-rw-r--r--addons/web/static/src/scss/kanban_examples_dialog.scss2
-rw-r--r--addons/web/static/src/scss/kanban_view.scss4
-rw-r--r--addons/web/static/src/scss/primary_variables.scss4
-rw-r--r--addons/web/static/src/scss/secondary_variables.scss4
5 files changed, 18 insertions, 19 deletions
diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss
index a96775ee837..15dff6c2f51 100644
--- a/addons/web/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/scss/bootstrap_overridden.scss
@@ -7,17 +7,18 @@
// Color system
//
-$white: #fff !default; // This is BS default
-$gray-100: #f8f9fa !default; // This is BS default
-$gray-200: $o-color-silver; // FIXME keep this or use bootstrap default ? (also default 100 is very close to this color)
-$gray-300: #dee2e6 !default; // This is BS default
-$gray-400: #ced4da !default; // This is BS default
-$gray-500: #adb5bd !default; // This is BS default
-$gray-600: #6c757d !default; // This is BS default
-$gray-700: #495057 !default; // This is BS default
-$gray-800: #343a40 !default; // This is BS default
-$gray-900: #212529 !default; // This is BS default
-$black: #000 !default; // This is BS default
+// All of those are BS default
+$white: #fff !default;
+$gray-100: $o-gray-100 !default;
+$gray-200: #e9ecef !default;
+$gray-300: #dee2e6 !default;
+$gray-400: #ced4da !default;
+$gray-500: #adb5bd !default;
+$gray-600: #6c757d !default;
+$gray-700: #495057 !default;
+$gray-800: #343a40 !default;
+$gray-900: #212529 !default;
+$black: #000 !default;
$primary: $o-brand-primary;
$secondary: $white;
diff --git a/addons/web/static/src/scss/kanban_examples_dialog.scss b/addons/web/static/src/scss/kanban_examples_dialog.scss
index 8b79e671019..65eadc9e0b4 100644
--- a/addons/web/static/src/scss/kanban_examples_dialog.scss
+++ b/addons/web/static/src/scss/kanban_examples_dialog.scss
@@ -1,7 +1,7 @@
.o_kanban_examples_dialog {
display: flex;
padding: 0px;
- background: $o-color-silver;
+ background: theme-color('light');
// sidebar
.o_kanban_examples_dialog_nav {
diff --git a/addons/web/static/src/scss/kanban_view.scss b/addons/web/static/src/scss/kanban_view.scss
index ec8f41da4d8..f4dc22ecec7 100644
--- a/addons/web/static/src/scss/kanban_view.scss
+++ b/addons/web/static/src/scss/kanban_view.scss
@@ -305,7 +305,7 @@
&.o_kanban_grouped {
min-height: 100%;
padding: 0;
- background-color: gray('200');
+ background-color: theme-color('light');
.o_kanban_record, .o_kanban_quick_create {
width: 100%;
@@ -443,7 +443,7 @@
height: 100%;
border: none;
box-shadow: 0 0 20px -10px;
- background-color: gray('200');
+ background-color: theme-color('light');
.o_kanban_header {
height: 50px;
diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss
index bc84cdef88a..0f7f43411c4 100644
--- a/addons/web/static/src/scss/primary_variables.scss
+++ b/addons/web/static/src/scss/primary_variables.scss
@@ -17,9 +17,7 @@ $o-brand-primary: $o-community-color;
$o-brand-secondary: #f0eeee;
$o-brand-lightsecondary: #e2e2e0;
-$o-color-silver: #F9F9F9; // FIXME
-// $o-color-silver-dark: #E5E5E5; // FIXME keep those or BS default ?
-// $o-color-silver-darker: #d9d7d7; // FIXME keep those or BS default ?
+$o-gray-100: #f8f9fa; // This is BS default
$o-main-color-muted: #a8a8a8;
$o-main-text-color: #4c4c4c;
diff --git a/addons/web/static/src/scss/secondary_variables.scss b/addons/web/static/src/scss/secondary_variables.scss
index 1787d629f94..ee7f15eded6 100644
--- a/addons/web/static/src/scss/secondary_variables.scss
+++ b/addons/web/static/src/scss/secondary_variables.scss
@@ -1,5 +1,5 @@
-$o-webclient-background-color: $o-color-silver;
-$o-control-panel-background-color: $o-color-silver;
+$o-webclient-background-color: $o-gray-100;
+$o-control-panel-background-color: $o-gray-100;
$o-list-footer-color: $o-main-text-color;
$o-list-group-header-color: lighten($o-brand-lightsecondary, 10%);