summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorsri-odoo <sri@odoo.com>2019-09-05 13:52:43 +0000
committerMathieu Duckerts-Antoine <dam@odoo.com>2019-09-12 12:45:53 +0000
commit94b3e339ba45f664e8b892067a4dd3df134ec325 (patch)
tree9260c46a2d956f7844313fdf6fe489320b5c9ebd /addons/web/static/src
parent5450f03038a0e37f3030e99ff57d1e3da9665903 (diff)
[REF] web: extend ui colours
closes odoo/odoo#36781 Signed-off-by: Géry Debongnie (ged) <ged@openerp.com>
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/scss/secondary_variables.scss10
-rw-r--r--addons/web/static/src/scss/web_calendar.scss34
2 files changed, 12 insertions, 32 deletions
diff --git a/addons/web/static/src/scss/secondary_variables.scss b/addons/web/static/src/scss/secondary_variables.scss
index 5b9d6ab239d..9580a278745 100644
--- a/addons/web/static/src/scss/secondary_variables.scss
+++ b/addons/web/static/src/scss/secondary_variables.scss
@@ -9,6 +9,16 @@ $o-list-group-header-color: lighten($o-brand-lightsecondary, 10%) !default;
$o-colors: lighten(#000, 46.7%), #F06050, #F4A460, #F7CD1F, #6CC1ED, #814968,
#EB7E7F, #2C8397, #475577, #D6145F, #30C381, #9365B8 !default;
+$o-colors-secondary: #aa4b6b, #30C381, #97743a, #F7CD1F, #4285F4, #8E24AA,
+ #D6145F, #173e43, #348F50, #AA3A38, #795548, #5e0231,
+ #6be585, #999966, #e9d362, #b56969, #bdc3c7, #649173 !default;
+
+// UI custom colors, complete list
+$o-colors-complete: join(
+ set-nth(set-nth($o-colors, 1, #134E5E), 6, #3daec3),
+ $o-colors-secondary
+)!default;
+
$o-sheet-cancel-hpadding: $o-horizontal-padding !default;
$o-sheet-cancel-bpadding: $o-horizontal-padding !default;
diff --git a/addons/web/static/src/scss/web_calendar.scss b/addons/web/static/src/scss/web_calendar.scss
index cf0da7c8abd..ed99c4fcd6f 100644
--- a/addons/web/static/src/scss/web_calendar.scss
+++ b/addons/web/static/src/scss/web_calendar.scss
@@ -581,38 +581,8 @@ $o-cw-filter-avatar-size: 20px;
}
// =============== Generate color classes ===============
-// These colors are specifically designed for calendar
-// =============== =============== ======================
-$o-cw-colors: (
- #5e0231, // 1:
- #97743a, // 2:
- #F4A460, // 3:
- #F7CD1F, // 4:
- #6CC1ED, // 5:
- #4285F4, // 6: Default User
- #8E24AA, // 7:
- #2C8397, // 8:
- #475577, // 9:
- #D6145F, // 10:
- #30C381, // 11:
- #9365B8, // 12:
- #aa4b6b, // 13:
- #348F50, // 14:
- #AA3A38, // 15:
- #173e43, // 16:
- #134E5E, // 17:
- #795548, // 18:
- #6be585, // 19:
- #999966, // 20:
- #e9d362, // 21:
- #b56969, // 22:
- #bdc3c7, // 23:
- #649173, // 24:
-);
-
-
-@for $i from 1 to length($o-cw-colors) + 1 {
- $color: nth($o-cw-colors, $i);
+@for $i from 1 through length($o-colors-complete) {
+ $color: nth($o-colors-complete, $i);
.o_calendar_view .fc-view {
.fc-event.o_calendar_color_#{$i} {