From daf60a5c11e0baba2f28587c6c6019986b3d4e0d Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Tue, 14 Apr 2020 11:25:45 +0200 Subject: [PATCH] color updates --- zero.Web/App/Components/Tables/table.vue | 2 +- zero.Web/App/pages/settings/countries.vue | 19 ++++++------------- .../Resources/Localization/zero.en-us.json | 3 ++- zero.Web/Sass/Core/_settings.scss | 4 +++- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/zero.Web/App/Components/Tables/table.vue b/zero.Web/App/Components/Tables/table.vue index b178fbfd..75dd6b2b 100644 --- a/zero.Web/App/Components/Tables/table.vue +++ b/zero.Web/App/Components/Tables/table.vue @@ -336,7 +336,7 @@ .ui-table-field-bool { font-family: var(--font-icon); - color: var(--color-fg-light); + color: var(--color-fg-xlight); &:before { diff --git a/zero.Web/App/pages/settings/countries.vue b/zero.Web/App/pages/settings/countries.vue index 50d57b5c..dbb1409b 100644 --- a/zero.Web/App/pages/settings/countries.vue +++ b/zero.Web/App/pages/settings/countries.vue @@ -29,13 +29,17 @@ label: '', as: 'html', render: item => ``, - width: 45 + width: 62 }, name: { as: 'text', bold: true }, code: 'text', + isPreferred: { + as: 'bool', + width: 200 + }, isActive: { as: 'bool', label: '@ui.active', @@ -54,15 +58,4 @@ } } } - - - \ No newline at end of file + \ No newline at end of file diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json index 6ce9dd0e..8e0470be 100644 --- a/zero.Web/Resources/Localization/zero.en-us.json +++ b/zero.Web/Resources/Localization/zero.en-us.json @@ -141,7 +141,8 @@ "country": { "fields": { "name": "Name", - "code": "ISO" + "code": "ISO", + "isPreferred": "Show on top" } } } \ No newline at end of file diff --git a/zero.Web/Sass/Core/_settings.scss b/zero.Web/Sass/Core/_settings.scss index 00881146..17cbe001 100644 --- a/zero.Web/Sass/Core/_settings.scss +++ b/zero.Web/Sass/Core/_settings.scss @@ -11,10 +11,11 @@ --color-fg: #222; --color-fg-mid: #6f7375; --color-fg-light: #919294; + --color-fg-xlight: #bec0c3; // background color shades --color-bg: #f4f5f6; - --color-bg-mid: #f0f1f2; + --color-bg-mid: #f4f5f6; --color-bg-light: #fff; --color-bg-xlight: #f8f9fa; @@ -66,6 +67,7 @@ --color-fg: #fff; --color-fg-mid: #c1c5c9; --color-fg-light: #919294; + --color-fg-xlight: #919294; /*--color-fg: #222; --color-fg-mid: #6f7375;