From 6513fc6ed4d1a3c01759b08509a11e2570d43953 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Mon, 2 Sep 2019 14:49:33 +0200 Subject: [PATCH] added color to icon in password match label [ci skip] --- main/ui/src/main/resources/css/dark_theme.css | 12 ++++++++---- main/ui/src/main/resources/css/light_theme.css | 12 ++++++++---- .../main/resources/fxml/addvault_new_password.fxml | 4 ++-- main/ui/src/main/resources/fxml/changepassword.fxml | 4 ++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css index 0eaeac596..97ebbef7c 100644 --- a/main/ui/src/main/resources/css/dark_theme.css +++ b/main/ui/src/main/resources/css/dark_theme.css @@ -116,10 +116,6 @@ -fx-fill: TEXT_FILL; } -.glyph-icon-white { - -fx-fill: white; -} - .glyph-icon-primary { -fx-fill: PRIMARY_BG; } @@ -128,6 +124,14 @@ -fx-fill: SECONDARY_BG; } +.glyph-icon-white { + -fx-fill: white; +} + +.glyph-icon-red { + -fx-fill: RED_5; +} + /******************************************************************************* * * * Main Window * diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css index 092d5327c..67def5b23 100644 --- a/main/ui/src/main/resources/css/light_theme.css +++ b/main/ui/src/main/resources/css/light_theme.css @@ -116,10 +116,6 @@ -fx-fill: TEXT_FILL; } -.glyph-icon-white { - -fx-fill: white; -} - .glyph-icon-primary { -fx-fill: PRIMARY_BG; } @@ -128,6 +124,14 @@ -fx-fill: SECONDARY_BG; } +.glyph-icon-white { + -fx-fill: white; +} + +.glyph-icon-red { + -fx-fill: RED_5; +} + /******************************************************************************* * * * Main Window * diff --git a/main/ui/src/main/resources/fxml/addvault_new_password.fxml b/main/ui/src/main/resources/fxml/addvault_new_password.fxml index 1c6fd1f0d..65195a6bb 100644 --- a/main/ui/src/main/resources/fxml/addvault_new_password.fxml +++ b/main/ui/src/main/resources/fxml/addvault_new_password.fxml @@ -37,8 +37,8 @@