From 1a9329b86bfbe71155c9fde0bafe7b6cc94991ff Mon Sep 17 00:00:00 2001 From: "kostya.danovsky" Date: Wed, 11 May 2016 20:21:43 +0300 Subject: [PATCH] fix(dashboard): choose todo style according to theme --- .../pages/dashboard/dashboardTodo/DashboardTodoCtrl.js | 3 ++- src/app/pages/dashboard/dashboardTodo/dashboardTodo.html | 2 +- src/sass/theme/dashboard/_todo.scss | 8 ++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js index bfd9de7..82f3104 100644 --- a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js +++ b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js @@ -9,8 +9,9 @@ .controller('DashboardTodoCtrl', DashboardTodoCtrl); /** @ngInject */ - function DashboardTodoCtrl($scope, layoutColors) { + function DashboardTodoCtrl($scope, layoutColors, layoutTheme) { + $scope.transparent = layoutTheme.blur; var palette = layoutColors.bgColorPalette; var colors = []; for (var key in palette) { diff --git a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html index 86b1d1a..db46df6 100644 --- a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html +++ b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/sass/theme/dashboard/_todo.scss b/src/sass/theme/dashboard/_todo.scss index 347e869..d4bea77 100644 --- a/src/sass/theme/dashboard/_todo.scss +++ b/src/sass/theme/dashboard/_todo.scss @@ -163,7 +163,7 @@ label.todo-checkbox { label.todo-checkbox > span { &:before { position: absolute; - color: white; + color: $default-text; content: '\f10c'; float: none; margin-right: 6px; @@ -173,11 +173,7 @@ label.todo-checkbox { &.checked { label.todo-checkbox > span { &:before { - margin-right: 0; - position: absolute; - content: ''; - background-size: contain; - background: url($images-root + "app/todo/check-icon.png") no-repeat; + content: '\f00c'; } } }