From dd75d5e9fd404871f2b52311e1989cf0ef63542a Mon Sep 17 00:00:00 2001 From: g <63980406+gugulet-hu@users.noreply.github.com> Date: Tue, 15 Sep 2020 16:30:30 +0200 Subject: [PATCH] Colour changes, removed borders... simplified --- stylesheets/_colors.less | 20 +++++++++--------- stylesheets/_variables.less | 2 +- stylesheets/components/_button.less | 7 ++++++- stylesheets/components/_card.less | 4 ++-- stylesheets/components/_control.less | 2 +- stylesheets/components/_header.less | 2 +- stylesheets/components/_menu.less | 8 ++++---- stylesheets/components/_sparkline.less | 26 ++++++++++++------------ stylesheets/components/_visitor_log.less | 4 ++-- stylesheets/components/_widget.less | 10 ++++----- stylesheets/theme.less | 18 ++++++++-------- 11 files changed, 54 insertions(+), 49 deletions(-) diff --git a/stylesheets/_colors.less b/stylesheets/_colors.less index 93952fc..ba6a003 100644 --- a/stylesheets/_colors.less +++ b/stylesheets/_colors.less @@ -1,12 +1,12 @@ -@theme-color-brand: #1a73e8; -@theme-color-background-base: #f8f9fa; -@theme-color-header-background: #ffffff; -@theme-color-header-text: #5f6368; +@theme-color-brand: #CECCD2; +@theme-color-background-base: #faf9f6; +@theme-color-header-background: #FAF9F6; +@theme-color-header-text: #323036; -@theme-color-widget-title-background: #f8f9fa; -@theme-color-widget-title-text: #4a4a4a; +@theme-color-widget-title-background: transparent; +@theme-color-widget-title-text: #323036; -@theme-color-menu-contrast-text: rgba(0,0,0,0.54); -@theme-color-menu-contrast-textActive: #3c4043; -@theme-color-menu-contrast-textSelected: #1a73e8; -@theme-color-menu-contrast-background: transprent; \ No newline at end of file +@theme-color-menu-contrast-text: rgba(0, 0, 0, 0.54); +@theme-color-menu-contrast-textActive: #828089; +@theme-color-menu-contrast-textSelected: #ceccd2; +@theme-color-menu-contrast-background: transprent; diff --git a/stylesheets/_variables.less b/stylesheets/_variables.less index 69c94e1..da97d00 100644 --- a/stylesheets/_variables.less +++ b/stylesheets/_variables.less @@ -1 +1 @@ -@theme-fontFamily-base: Arial, Verdana, sans-serif; \ No newline at end of file +@theme-fontFamily-base: "Roboto", Helvetica, sans-serif; \ No newline at end of file diff --git a/stylesheets/components/_button.less b/stylesheets/components/_button.less index 0d987c7..3f10ac1 100644 --- a/stylesheets/components/_button.less +++ b/stylesheets/components/_button.less @@ -1,9 +1,14 @@ .btn, input[type="button"], .button { box-shadow: none; text-decoration: none; + text-transform: uppercase; + border: none; + font-weight: bold; + letter-spacing: 1.5em; &:hover { - opacity: 0.8; + color: #CECCD2; box-shadow: none; + border: none; } } \ No newline at end of file diff --git a/stylesheets/components/_card.less b/stylesheets/components/_card.less index d60f34a..6e41279 100644 --- a/stylesheets/components/_card.less +++ b/stylesheets/components/_card.less @@ -1,8 +1,8 @@ .card { //box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 2px 1px -1px rgba(0, 0, 0, .12); box-shadow: none; - border: 1px solid #e6e6e6; - border-radius: 8px; + border: none; + border-radius: 0px; .card-content { padding: 5px 20px 20px 20px !important; diff --git a/stylesheets/components/_control.less b/stylesheets/components/_control.less index 00c26f7..93b6eec 100644 --- a/stylesheets/components/_control.less +++ b/stylesheets/components/_control.less @@ -1,6 +1,6 @@ #root .borderedControl { background-color: transparent; - border: 1px solid #e6e6e6; //#dadce1; + border: none; box-shadow: none; transition: .2s ease all; border-radius: 3px; diff --git a/stylesheets/components/_header.less b/stylesheets/components/_header.less index 956340b..840c918 100644 --- a/stylesheets/components/_header.less +++ b/stylesheets/components/_header.less @@ -2,6 +2,6 @@ nav { box-shadow: none !important; .nav-wrapper { - border-bottom: 1px solid #dadce0; + border-bottom: none; } } \ No newline at end of file diff --git a/stylesheets/components/_menu.less b/stylesheets/components/_menu.less index 50851cf..55f12eb 100644 --- a/stylesheets/components/_menu.less +++ b/stylesheets/components/_menu.less @@ -2,17 +2,17 @@ ul { & > li > ul > li.active > .item { - background-color: #e8f0fe !important; + background-color: #E6E6E6 !important; } li { &.active > a { - background-color: #e8eaed !important; + background-color: #CECCD2 !important; } a { - border-radius: 0 50em 50em 0; + border-radius: 0; font-weight: 500; font-size: 14px; //letter-spacing: .25px; @@ -24,7 +24,7 @@ } &:hover { - background-color: #dadce1 !important; + background-color: #CECCD2 !important; transition: .2s ease all; } } diff --git a/stylesheets/components/_sparkline.less b/stylesheets/components/_sparkline.less index 7207082..17c37cc 100644 --- a/stylesheets/components/_sparkline.less +++ b/stylesheets/components/_sparkline.less @@ -1,24 +1,24 @@ // sparkline colors -.sparkline-colors[data-name=backgroundColor] { - color: white; +.sparkline-colors[data-name="backgroundColor"] { + color: white; } -.sparkline-colors[data-name=lineColor] { - color: #058DC7; +.sparkline-colors[data-name="lineColor"] { + color: #323036; } -.sparkline-colors[data-name=minPointColor] { - color: #058DC7 //darken(#058DC7, 10); +.sparkline-colors[data-name="minPointColor"] { + color: #323036 //darken(#058DC7, 10); } -.sparkline-colors[data-name=maxPointColor] { - color: #058DC7 //darken(#058DC7, 10); +.sparkline-colors[data-name="maxPointColor"] { + color: #323036 //darken(#058DC7, 10); } -.sparkline-colors[data-name=lastPointColor] { - color: white; //hidden +.sparkline-colors[data-name="lastPointColor"] { + color: white; //hidden } -.sparkline-colors[data-name=fillColor] { - color: lighten(#058DC7, 55); -} \ No newline at end of file +.sparkline-colors[data-name="fillColor"] { + color: lighten(#323036, 55); +} diff --git a/stylesheets/components/_visitor_log.less b/stylesheets/components/_visitor_log.less index 81f2bfa..2b6e7e9 100644 --- a/stylesheets/components/_visitor_log.less +++ b/stylesheets/components/_visitor_log.less @@ -4,6 +4,6 @@ .dataTableVizVisitorLog .card { box-shadow: none; - border: 1px solid #e6e6e6; - border-radius: 8px; + border: none; + border-radius: 0px; } \ No newline at end of file diff --git a/stylesheets/components/_widget.less b/stylesheets/components/_widget.less index bcb360c..91cc485 100644 --- a/stylesheets/components/_widget.less +++ b/stylesheets/components/_widget.less @@ -1,5 +1,5 @@ .widget { - background-color: transparent; + background-color: white; box-shadow: none; border: none !important; @@ -30,12 +30,12 @@ .widgetName { padding: 0 0 15px 0 !important; font-weight: 300; - color: #4a4a4a; + color: @theme-color-header-text; } } .widgetContent { - background-color: #ffffff; + background-color: @theme-color-background-base; /*border-radius: 2px; border: none; padding: 14px; @@ -43,8 +43,8 @@ padding-top: 15px; box-shadow: none; - border: 1px solid #e6e6e6; - border-radius: 8px; + border: none; + border-radius: 0px; overflow: hidden; .dataTable, .card { diff --git a/stylesheets/theme.less b/stylesheets/theme.less index 9ba7633..8d47633 100644 --- a/stylesheets/theme.less +++ b/stylesheets/theme.less @@ -12,15 +12,15 @@ @import "components/_visitor_log"; @import "components/_widget"; -@theme-color-brand: #1a73e8; -@theme-color-background-base: #f8f9fa; -@theme-color-header-background: #ffffff; -@theme-color-header-text: #5f6368; +@theme-color-brand: #CECCD2; +@theme-color-background-base: #FAF9F6; +@theme-color-header-background: #FAF9F6; +@theme-color-header-text: #323036; -@theme-color-widget-title-background: #f8f9fa; -@theme-color-widget-title-text: #4a4a4a; +@theme-color-widget-title-background: transparent; +@theme-color-widget-title-text: #323036; @theme-color-menu-contrast-text: rgba(0,0,0,0.54); -@theme-color-menu-contrast-textActive: #3c4043; -@theme-color-menu-contrast-textSelected: #1a73e8; -@theme-color-menu-contrast-background: transprent; \ No newline at end of file +@theme-color-menu-contrast-textActive: #828089; +@theme-color-menu-contrast-textSelected: #CECCd2; +@theme-color-menu-contrast-background: transparent; \ No newline at end of file