From 7fce552ee7b51213b8d715e4f664b345c836970c Mon Sep 17 00:00:00 2001 From: Katrin Yordanova Date: Fri, 31 Mar 2023 19:57:15 +0300 Subject: [PATCH] Apply new color variables to webapps --- .../src/components/Apigw/CFiltersDropdown.vue | 2 +- .../Permissions/CPermissionList.vue | 4 ++-- .../src/themes/corteza-base/variables.scss | 10 ++++----- .../components/Chart/Report/ReportEdit.c3.js | 2 +- .../compose/src/components/Common/Grid.vue | 2 +- .../components/Common/RecordListFilter.vue | 10 ++++----- .../FeedSource/configs/Record.c3.js | 2 +- .../FeedSource/configs/Reminder.c3.js | 2 +- .../components/PageBlocks/GeometryBase.vue | 2 +- .../PageBlocks/MetricConfigurator/index.vue | 2 +- .../src/themes/corteza-base/custom.scss | 2 +- .../src/themes/corteza-base/variables.scss | 10 ++++----- .../compose/src/views/Admin/Pages/List.vue | 10 ++++----- .../discovery/src/components/DiscoveryMap.vue | 2 +- .../web/discovery/src/components/Search.vue | 2 +- .../src/themes/corteza-base/variables.scss | 14 ++++++------ .../src/themes/corteza-base/variables.scss | 12 +++++----- client/web/one/src/views/Bridge/Jitsi.vue | 2 +- .../privacy/src/components/ConnectionMap.vue | 2 +- .../src/themes/corteza-base/variables.scss | 10 ++++----- .../src/components/Common/Prefilter.vue | 2 +- .../Report/Datasources/Aggregate/GroupBy.vue | 2 +- .../reporter/src/components/Report/Grid.vue | 2 +- .../src/themes/corteza-base/variables.scss | 10 ++++----- .../src/components/ExpressionEditor.vue | 4 ++-- .../src/components/WorkflowEditor.vue | 2 +- .../src/themes/corteza-base/custom.scss | 4 ++-- .../src/themes/corteza-base/mxgraph.scss | 2 +- .../src/themes/corteza-base/variables.scss | 12 +++++----- lib/js/src/compose/types/chart/chart.ts | 2 +- lib/js/src/compose/types/chart/gauge.ts | 2 +- .../compose/types/page-block/calendar/feed.ts | 2 +- lib/js/src/corredor/helpers/compose.ts | 2 +- .../types/display-elements/chart/basic.ts | 2 +- .../reporter/types/display-elements/metric.ts | 4 ++-- .../shared/types/chart/colorschemes/brewer.ts | 14 ++++++------ .../types/chart/colorschemes/tableau.ts | 22 +++++++++---------- lib/vue/src/components/c3/C3.vue | 14 ++++++------ .../filePreview/common/types/PDF/PDF.vue | 4 ++-- lib/vue/src/components/input/CInputSearch.vue | 2 +- lib/vue/src/components/navigation/CTopbar.vue | 2 +- .../components/permissions/form/Access.vue | 2 +- .../reporter/Viewers/CReportMetric.vue | 4 ++-- server/auth/assets/public/style.css | 4 ++-- server/provision/002_templates/general.yml | 6 ++--- server/provision/700_crm/1400_pages.yaml | 2 +- .../steinfletcher/apitest/template.go | 2 +- 47 files changed, 118 insertions(+), 118 deletions(-) diff --git a/client/web/admin/src/components/Apigw/CFiltersDropdown.vue b/client/web/admin/src/components/Apigw/CFiltersDropdown.vue index 35d39a786..dce778d68 100644 --- a/client/web/admin/src/components/Apigw/CFiltersDropdown.vue +++ b/client/web/admin/src/components/Apigw/CFiltersDropdown.vue @@ -74,6 +74,6 @@ export default { diff --git a/client/web/admin/src/components/Permissions/CPermissionList.vue b/client/web/admin/src/components/Permissions/CPermissionList.vue index e607bad2e..8e5ed4b4b 100644 --- a/client/web/admin/src/components/Permissions/CPermissionList.vue +++ b/client/web/admin/src/components/Permissions/CPermissionList.vue @@ -504,7 +504,7 @@ export default { cursor: not-allowed; } .active-cell:hover { - background-color: #F3F3F5; + background-color: $gray-200; } .rotate { transform: rotate(45deg); @@ -519,7 +519,7 @@ export default { diff --git a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.c3.js b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.c3.js index 63fa87571..2e0835e80 100644 --- a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.c3.js +++ b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.c3.js @@ -60,7 +60,7 @@ export default { ...props, feed: { options: { - color: '#ffff', + color: '#FFFFFF', moduleID: '5555555', prefilter: '', }, diff --git a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.c3.js b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.c3.js index d35c7a054..d9d995273 100644 --- a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.c3.js +++ b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Reminder.c3.js @@ -25,7 +25,7 @@ export default { props: { ...props, feed: { - options: { color: '#ffff' }, + options: { color: '#FFFFFF' }, }, }, }, diff --git a/client/web/compose/src/components/PageBlocks/GeometryBase.vue b/client/web/compose/src/components/PageBlocks/GeometryBase.vue index 0bcbabc9d..c95a3895d 100644 --- a/client/web/compose/src/components/PageBlocks/GeometryBase.vue +++ b/client/web/compose/src/components/PageBlocks/GeometryBase.vue @@ -215,7 +215,7 @@ export default { }, getIcon (item) { - item.circleColor = '#ffffff' + item.circleColor = '#FFFFFF' return divIcon({ className: 'marker-pin', diff --git a/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue b/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue index b497a6007..f80e86de0 100644 --- a/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue +++ b/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue @@ -396,7 +396,7 @@ export default { const m = { labelStyle: {}, valueStyle: { - backgroundColor: '#ffffff', + backgroundColor: '#FFFFFF', }, } this.metrics.push(m) diff --git a/client/web/compose/src/themes/corteza-base/custom.scss b/client/web/compose/src/themes/corteza-base/custom.scss index bd44ddc26..2e0916a99 100644 --- a/client/web/compose/src/themes/corteza-base/custom.scss +++ b/client/web/compose/src/themes/corteza-base/custom.scss @@ -272,7 +272,7 @@ input[type="search"]::-webkit-search-cancel-button { .modal-content { &.card { - background-color: #FFF; + background-color: $white; background-clip: border-box; border: 0 solid rgba(0, 0, 0, 0.125); border-radius: 1rem; diff --git a/client/web/compose/src/themes/corteza-base/variables.scss b/client/web/compose/src/themes/corteza-base/variables.scss index c982d1766..e7a862087 100644 --- a/client/web/compose/src/themes/corteza-base/variables.scss +++ b/client/web/compose/src/themes/corteza-base/variables.scss @@ -16,17 +16,17 @@ $font-family-base: $font-regular !default; $headings-font-family: $font-semibold !default; // Color system -$white: #FFF !default; -$black: #000 !default; +$white: #FFFFFF !default; +$black: #162425 !default; $primary: #0B344E !default; $secondary: #758D9B !default; $success: #43AA8B !default; -$warning: #F5D380 !default; -$danger: #E24646 !default; +$warning: #E2A046 !default; +$danger: #E54122 !default; $light: #E4E9EF !default; $dark: #162425 !default; -$gray-200: #F3F3F5 !default; +$gray-200: #F9FAFB !default; $theme-colors: () !default; $theme-colors: map-merge( diff --git a/client/web/compose/src/views/Admin/Pages/List.vue b/client/web/compose/src/views/Admin/Pages/List.vue index 319f758b0..8bdd9e6ea 100644 --- a/client/web/compose/src/views/Admin/Pages/List.vue +++ b/client/web/compose/src/views/Admin/Pages/List.vue @@ -191,7 +191,7 @@ $dropping-color: $secondary; li { white-space: nowrap; - background: white; + background: $white; &.blank-li { height: $blank-li-height !important; @@ -201,20 +201,20 @@ $dropping-color: $secondary; } &:nth-last-of-type(1)::before { - border-left-color: white !important; + border-left-color: $white !important; height: 0; } } &::before { top: $content-height / -2 !important; - border-left-color: white !important; + border-left-color: $white !important; } &::after { height: $content-height !important; top: $content-height / 2 !important; - border-color: #fff !important; + border-color: $white !important; } &.parent-li:nth-last-child(2)::before { @@ -247,7 +247,7 @@ $dropping-color: $secondary; &.exist-li { &::before { - border-color: white !important; + border-color: $white !important; } .parent-li { diff --git a/client/web/discovery/src/components/DiscoveryMap.vue b/client/web/discovery/src/components/DiscoveryMap.vue index d70741d3f..93a547559 100644 --- a/client/web/discovery/src/components/DiscoveryMap.vue +++ b/client/web/discovery/src/components/DiscoveryMap.vue @@ -87,6 +87,6 @@ export default { diff --git a/client/web/discovery/src/components/Search.vue b/client/web/discovery/src/components/Search.vue index 934f30229..d7395db77 100644 --- a/client/web/discovery/src/components/Search.vue +++ b/client/web/discovery/src/components/Search.vue @@ -43,7 +43,7 @@
.vl-style-text { - color: white; + color: $white; } diff --git a/client/web/privacy/src/themes/corteza-base/variables.scss b/client/web/privacy/src/themes/corteza-base/variables.scss index abe9c3f56..d1e000489 100644 --- a/client/web/privacy/src/themes/corteza-base/variables.scss +++ b/client/web/privacy/src/themes/corteza-base/variables.scss @@ -16,17 +16,17 @@ $font-family-base: $font-regular !default; $headings-font-family: $font-semibold !default; // Color system -$white: #FFF !default; -$black: #000 !default; +$white: #FFFFFF !default; +$black: #162425 !default; $primary: #0B344E !default; $secondary: #758D9B !default; $success: #43AA8B !default; -$warning: #F5D380 !default; -$danger: #E24646 !default; +$warning: #E2A046 !default; +$danger: #E54122 !default; $light: #E4E9EF !default; $dark: #162425 !default; -$gray-200: #F3F3F5 !default; +$gray-200: #F9FAFB !default; // Grid - maybe not the smartest idea to change this but let's see $grid-breakpoints: ( diff --git a/client/web/reporter/src/components/Common/Prefilter.vue b/client/web/reporter/src/components/Common/Prefilter.vue index 2568192d0..3b1dfdb2b 100644 --- a/client/web/reporter/src/components/Common/Prefilter.vue +++ b/client/web/reporter/src/components/Common/Prefilter.vue @@ -427,7 +427,7 @@ export default { .btn-add-group { &:hover, &:active { background-color: $primary !important; - color: white !important; + color: $white !important; } } diff --git a/client/web/reporter/src/components/Report/Datasources/Aggregate/GroupBy.vue b/client/web/reporter/src/components/Report/Datasources/Aggregate/GroupBy.vue index bda0fcbdf..c47ffc161 100644 --- a/client/web/reporter/src/components/Report/Datasources/Aggregate/GroupBy.vue +++ b/client/web/reporter/src/components/Report/Datasources/Aggregate/GroupBy.vue @@ -133,7 +133,7 @@ export default { .btn-add-group { &:hover, &:active { background-color: $primary !important; - color: white !important; + color: $white !important; } } diff --git a/client/web/reporter/src/components/Report/Grid.vue b/client/web/reporter/src/components/Report/Grid.vue index 06c5fd364..594f78e3f 100644 --- a/client/web/reporter/src/components/Report/Grid.vue +++ b/client/web/reporter/src/components/Report/Grid.vue @@ -130,7 +130,7 @@ export default { diff --git a/client/web/reporter/src/themes/corteza-base/variables.scss b/client/web/reporter/src/themes/corteza-base/variables.scss index abe9c3f56..d1e000489 100644 --- a/client/web/reporter/src/themes/corteza-base/variables.scss +++ b/client/web/reporter/src/themes/corteza-base/variables.scss @@ -16,17 +16,17 @@ $font-family-base: $font-regular !default; $headings-font-family: $font-semibold !default; // Color system -$white: #FFF !default; -$black: #000 !default; +$white: #FFFFFF !default; +$black: #162425 !default; $primary: #0B344E !default; $secondary: #758D9B !default; $success: #43AA8B !default; -$warning: #F5D380 !default; -$danger: #E24646 !default; +$warning: #E2A046 !default; +$danger: #E54122 !default; $light: #E4E9EF !default; $dark: #162425 !default; -$gray-200: #F3F3F5 !default; +$gray-200: #F9FAFB !default; // Grid - maybe not the smartest idea to change this but let's see $grid-breakpoints: ( diff --git a/client/web/workflow/src/components/ExpressionEditor.vue b/client/web/workflow/src/components/ExpressionEditor.vue index 23a132f6e..6f8cca48e 100644 --- a/client/web/workflow/src/components/ExpressionEditor.vue +++ b/client/web/workflow/src/components/ExpressionEditor.vue @@ -107,8 +107,8 @@ export default {