From b300a80c83a738ca51283ff66a39ace54b697303 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Thu, 24 Oct 2019 01:28:00 +0300 Subject: [PATCH] Update dark theme --- pom.xml | 2 +- src/main/java/logiledus/MainFx.java | 2 +- src/main/resources/dark.css | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 22f7453..fd25a21 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ loper LogiLedus - 1.1-SNAPSHOT + 1.2-SNAPSHOT diff --git a/src/main/java/logiledus/MainFx.java b/src/main/java/logiledus/MainFx.java index 4beaec9..796454e 100644 --- a/src/main/java/logiledus/MainFx.java +++ b/src/main/java/logiledus/MainFx.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.ResourceBundle; public class MainFx extends Application { - public static final String appVersion = "v1.1"; + public static final String appVersion = "v1.2"; private static boolean traySupport = true; diff --git a/src/main/resources/dark.css b/src/main/resources/dark.css index 0a866e2..62ed3b8 100644 --- a/src/main/resources/dark.css +++ b/src/main/resources/dark.css @@ -9,7 +9,7 @@ .button SVGPath{ -fx-fill: #ebebeb; } -.button, .toggle-button, .menu-button { +.button, .toggle-button, .menu-button, .color-picker { -fx-background-color: #3c3f41; -fx-background-insets: 0 0 0 0, 0, 1, 2; -fx-background-radius: 2; @@ -19,7 +19,7 @@ -fx-text-fill: #ebebeb; //-fx-effect: dropshadow(three-pass-box, #dadada, 2, 0, 0, 0); } -.menu-button:hover, .button:hover, .choice-box:hover, .menu-button:focused:hover, .button:focused:hover, .choice-box:focused:hover, .toggle-button:hover, .toggle-button:focused:hover{ +.menu-button:hover, .button:hover, .choice-box:hover, .menu-button:focused:hover, .button:focused:hover, .choice-box:focused:hover, .toggle-button:hover, .toggle-button:focused:hover, .color-picker:hover { -fx-background-color: #3c3f41; -fx-background-insets: 0 0 0 0, 0, 1, 2; -fx-background-radius: 2; @@ -29,7 +29,7 @@ -fx-text-fill: #ebebeb; //-fx-effect: dropshadow(three-pass-box, #4a81dd, 2, 0, 0, 0); } -.menu-button:focused, .button:focused, .choice-box:focused, .toggle-button:focused{ +.menu-button:focused, .button:focused, .choice-box:focused, .toggle-button:focused, .color-picker:focused { -fx-background-color: #4b4e51; -fx-background-insets: 0 0 0 0, 0, 1, 2; -fx-background-radius: 2; @@ -40,7 +40,9 @@ //-fx-effect: dropshadow(three-pass-box, #dadada, 2, 0, 0, 0); } -.menu-button:pressed, .button:pressed, .menu-button:pressed:hover, .button:pressed:hover, .toggle-button:pressed, .toggle-button:pressed:hover{ +.menu-button:pressed, .button:pressed, .menu-button:pressed:hover, .button:pressed:hover, +.toggle-button:pressed, .toggle-button:pressed:hover, +.color-picker:pressed, .color-picker:pressed:hover{ -fx-background-color: #3c3f41; -fx-background-insets: 0 0 0 0, 0, 1, 2; -fx-background-radius: 2; @@ -169,7 +171,7 @@ } */ /* -======================== Choice box =========================- */ -.choice-box { +.choice-box{ -fx-background-color: #3c3f41; -fx-border-color: #3c3f41; -fx-border-radius: 3; @@ -181,7 +183,7 @@ -fx-text-fill: #ebebeb; } -.choice-box:pressed, .choice-box:pressed:hover{ +.choice-box:pressed, .choice-box:pressed:hover { -fx-background-color: #3c3f41; -fx-border-color: #eea11e; -fx-border-radius: 3; @@ -246,11 +248,11 @@ -fx-padding: 10; } /* -========================== Context menu =====================- */ -.menu-button .label { +.menu-button .label, .color-picker .label { -fx-text-fill: #ebebeb; } -.menu-button .arrow { +.menu-button .arrow, .color-picker .arrow { -fx-background-color: #ebebeb; }