From 1ba2c902ad85534a3bd9160d956a11269e7dec31 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Fri, 22 Apr 2016 12:50:46 +0300 Subject: [PATCH] fix(theme): fix small issues for configurable color scheme --- .../amCharts/areaChart/AreaChartCtrl.js | 3 ++- .../pages/maps/map-lines/MapLinesPageCtrl.js | 20 +++++++++---------- src/app/pages/maps/map-lines/map-lines.html | 2 +- src/sass/404.scss | 1 + src/sass/auth.scss | 2 +- src/sass/theme/_layout.scss | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js index 3a05a93..464171e 100644 --- a/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js +++ b/src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js @@ -80,7 +80,8 @@ hh: 'h ', mm: 'min' }, - gridColor: layoutColors.defaultText, + gridAlpha: 0.5, + gridColor: layoutColors.border, } ], graphs: [ diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js index 5beb8ce..ec94a7a 100644 --- a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js +++ b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js @@ -77,16 +77,16 @@ top: 45, labelShiftY: 5, labelShiftX: 5, - color: layoutColors.default, - labelColor: layoutColors.default, - labelRollOverColor: layoutColors.default, + color: layoutColors.defaultText, + labelColor: layoutColors.defaultText, + labelRollOverColor: layoutColors.defaultText, labelFontSize: 20 }, { label: 'show flights from Vilnius', left: 106, top: 70, - labelColor: layoutColors.default, - labelRollOverColor: layoutColors.default, + labelColor: layoutColors.defaultText, + labelRollOverColor: layoutColors.defaultText, labelFontSize: 11, linkToObject: 'vilnius' } ] @@ -145,16 +145,16 @@ top: 45, labelShiftY: 5, labelShiftX: 5, - color: layoutColors.default, - labelColor: layoutColors.default, - labelRollOverColor: layoutColors.default, + color: layoutColors.defaultText, + labelColor: layoutColors.defaultText, + labelRollOverColor: layoutColors.defaultText, labelFontSize: 20 }, { label: 'show flights from London', left: 106, top: 70, - labelColor: layoutColors.default, - labelRollOverColor: layoutColors.default, + labelColor: layoutColors.defaultText, + labelRollOverColor: layoutColors.defaultText, labelFontSize: 11, linkToObject: 'london' } ] diff --git a/src/app/pages/maps/map-lines/map-lines.html b/src/app/pages/maps/map-lines/map-lines.html index 7bce7e7..8f32ce6 100644 --- a/src/app/pages/maps/map-lines/map-lines.html +++ b/src/app/pages/maps/map-lines/map-lines.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/sass/404.scss b/src/sass/404.scss index 6d9824c..e3b7a5b 100644 --- a/src/sass/404.scss +++ b/src/sass/404.scss @@ -13,6 +13,7 @@ html, body { body { font: 12px/16px $font-family; color: $default-text; + background-color: $default; display: flex; align-items: center; } diff --git a/src/sass/auth.scss b/src/sass/auth.scss index a92abed..d471b03 100644 --- a/src/sass/auth.scss +++ b/src/sass/auth.scss @@ -33,7 +33,7 @@ html { width: 540px; margin: 0 auto; border-radius: 5px; - background-color: white; + background-color: $default; color: $default-text; padding: 32px; h1 { diff --git a/src/sass/theme/_layout.scss b/src/sass/theme/_layout.scss index 29df59a..51583d6 100644 --- a/src/sass/theme/_layout.scss +++ b/src/sass/theme/_layout.scss @@ -120,7 +120,7 @@ a { i { cursor: pointer; transition: all 0.1s ease; - color: $default; + color: white; padding: 6px; box-sizing: content-box; font-size: 16px;