From d4dd8fffeee3801f253b727e976875aefb206625 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 18 May 2016 13:20:21 +0300 Subject: [PATCH] content-text variables fixes --- src/app/pages/dashboard/calendar/calendar.scss | 4 ++-- src/app/pages/dashboard/pieChart/pieChart.scss | 2 +- src/app/pages/dashboard/popularApp/popularApp.scss | 2 +- src/app/pages/dashboard/todo/todo.scss | 4 ++-- src/app/theme/sass/bootstrap-overrides/_card.scss | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/pages/dashboard/calendar/calendar.scss b/src/app/pages/dashboard/calendar/calendar.scss index f7fd28b2..3aadaf47 100644 --- a/src/app/pages/dashboard/calendar/calendar.scss +++ b/src/app/pages/dashboard/calendar/calendar.scss @@ -752,7 +752,7 @@ a.fc-more { background: transparent; box-shadow: none; border: none; - color: $default-text; + color: $content-text; } .fc-next-button { left: 30px; @@ -760,6 +760,6 @@ a.fc-more { .fc-prev-button { } .fc-day-number{ - color: $default-text; + color: $content-text; opacity: 0.9; } diff --git a/src/app/pages/dashboard/pieChart/pieChart.scss b/src/app/pages/dashboard/pieChart/pieChart.scss index b036ae1c..a75645f3 100644 --- a/src/app/pages/dashboard/pieChart/pieChart.scss +++ b/src/app/pages/dashboard/pieChart/pieChart.scss @@ -1,7 +1,7 @@ @import "../../../theme/sass/conf/conf"; .pie-charts { - color: $default-text; + color: $content-text; .pie-chart-item-container { position: relative; diff --git a/src/app/pages/dashboard/popularApp/popularApp.scss b/src/app/pages/dashboard/popularApp/popularApp.scss index 6c30f8b8..5d3203e9 100644 --- a/src/app/pages/dashboard/popularApp/popularApp.scss +++ b/src/app/pages/dashboard/popularApp/popularApp.scss @@ -22,7 +22,7 @@ display: inline-block; margin: 10px; font-size: 26px; - color: $default-text; + color: $content-text; } } } diff --git a/src/app/pages/dashboard/todo/todo.scss b/src/app/pages/dashboard/todo/todo.scss index 52b9d2b5..87ada47c 100644 --- a/src/app/pages/dashboard/todo/todo.scss +++ b/src/app/pages/dashboard/todo/todo.scss @@ -39,7 +39,7 @@ ul.todo-list { &.checked { .todo-text { - color: $default-text; + color: $content-text; } &:before { background: $input-border !important; @@ -165,7 +165,7 @@ label.todo-checkbox { label.todo-checkbox > span { &:before { position: absolute; - color: $default-text; + color: $content-text; content: '\f10c'; float: none; margin-right: 6px; diff --git a/src/app/theme/sass/bootstrap-overrides/_card.scss b/src/app/theme/sass/bootstrap-overrides/_card.scss index e7a7a1b7..06952652 100644 --- a/src/app/theme/sass/bootstrap-overrides/_card.scss +++ b/src/app/theme/sass/bootstrap-overrides/_card.scss @@ -67,6 +67,7 @@ $card-header-font-size: 16px; } .card-header, .card-footer { + color: $content-text; border-bottom: 1px solid rgba(0, 0, 0, 0.12); box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.12); height: $card-title-height; @@ -81,6 +82,7 @@ $card-header-font-size: 16px; font-size: $card-header-font-size; text-transform: uppercase; opacity: 0.9; + color: $content-text; }