From 1545c174725430d834b8dd679c326fa95174718e Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 22 Jul 2017 21:42:12 +0200 Subject: [PATCH] Moved label colours to template/theme; added freshgreen and dark --- digimarks.py | 38 ++++++++++++++++++++++++++++++++++++++ static/css/digimarks.css | 10 ---------- templates/base.html | 16 ++++++++++++++-- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/digimarks.py b/digimarks.py index 09993ac..5434bd0 100644 --- a/digimarks.py +++ b/digimarks.py @@ -18,6 +18,8 @@ from peewee import * # noqa themes = { 'green': { 'BODY': 'grey lighten-4', + 'TEXT': 'black-text', + 'TEXTHEX': '#000', 'NAV': 'green darken-3', 'PAGEHEADER': 'grey-text lighten-5', 'MESSAGE_BACKGROUND': 'orange lighten-2', @@ -28,6 +30,42 @@ themes = { 'CARD_TEXT': 'white-text', 'FAB': 'red', + 'STAR': 'yellow-text', + 'PROBLEM': 'red-text', + 'COMMENT': '', + }, + 'freshgreen': { + 'BODY': 'grey lighten-5', + 'TEXT': 'black-text', + 'TEXTHEX': '#000', + 'NAV': 'green darken-1', + 'PAGEHEADER': 'grey-text lighten-5', + 'MESSAGE_BACKGROUND': 'orange lighten-2', + 'MESSAGE_TEXT': 'white-text', + 'ERRORMESSAGE_BACKGROUND': 'red darken-1', + 'ERRORMESSAGE_TEXT': 'white-text', + 'CARD_BACKGROUND': 'green darken-1', + 'CARD_TEXT': 'white-text', + 'FAB': 'red', + + 'STAR': 'yellow-text', + 'PROBLEM': 'red-text', + 'COMMENT': '', + }, + 'dark': { + 'BODY': 'grey darken-4', + 'TEXT': 'grey-text lighten-1', + 'TEXTHEX': '#bdbdbd', + 'NAV': 'grey darken-3', + 'PAGEHEADER': 'grey-text lighten-1', + 'MESSAGE_BACKGROUND': 'orange lighten-2', + 'MESSAGE_TEXT': 'white-text', + 'ERRORMESSAGE_BACKGROUND': 'red darken-1', + 'ERRORMESSAGE_TEXT': 'white-text', + 'CARD_BACKGROUND': 'grey darken-3', + 'CARD_TEXT': 'grey-text lighten-1', + 'FAB': 'red', + 'STAR': 'yellow-text', 'PROBLEM': 'red-text', 'COMMENT': '', diff --git a/static/css/digimarks.css b/static/css/digimarks.css index a675a8e..505e71b 100644 --- a/static/css/digimarks.css +++ b/static/css/digimarks.css @@ -18,16 +18,6 @@ nav .button-collapse i /** Form input fields **/ -/* label color */ -.input-field label -{ - color: #000; -} -/* label focus color */ -.input-field input[type=text]:focus + label -{ - color: #000; -} /* label underline focus color */ .input-field input[type=text]:focus { diff --git a/templates/base.html b/templates/base.html index dc95b0b..1334420 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,10 +18,22 @@ - + + - +