Big manual merge

2017-08-04 11:20:17 +02:00
parent e7d09c1ddb fb13e656b7
commit 0d1f19f5d4
71 changed files with 3489 additions and 1004 deletions
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -29,6 +29,7 @@
 .settingsColor { color: @toolbar-settings-bg; }
 .profileColor { color: @toolbar-settings-bg; }
 .defaultColor { color: @toolbar-default-bg; }
+.todoColor { color:@toolbar-todo-bg; }

 .toolbar-container {
    display: flex;
@@ -284,6 +285,11 @@ body {
        @color: @toolbar-profile-color;
        .addToolbarColors(@color, @bgcolor);
    }
+    &.app-todo {
+        @bgcolor: @toolbar-todo-bg;
+        @color: @toolbar-todo-color;
+        .addToolbarColors(@color, @bgcolor);
+    }

 }