From 0bc4aa5f3bc15d98caa36df87ea1b8e24b6bf7f8 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Tue, 29 Oct 2019 05:21:32 +0300 Subject: [PATCH] Update UI --- .../java/logiledus/Controllers/Model/RuleBox.java | 2 ++ src/main/resources/dark.css | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/logiledus/Controllers/Model/RuleBox.java b/src/main/java/logiledus/Controllers/Model/RuleBox.java index ae0e134..167ec01 100644 --- a/src/main/java/logiledus/Controllers/Model/RuleBox.java +++ b/src/main/java/logiledus/Controllers/Model/RuleBox.java @@ -2,6 +2,7 @@ package logiledus.Controllers.Model; import javafx.geometry.Insets; import javafx.geometry.Orientation; +import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.control.*; import javafx.scene.layout.FlowPane; @@ -69,6 +70,7 @@ public class RuleBox extends HBox { // todo: add class to selected toggle user * */ public RuleBox(){ super(); + this.setAlignment(Pos.CENTER_LEFT); Insets insets = new Insets(3.0, 3.0, 3.0, 3.0); // Radio button for selecting rule radBtn = new RadioButton(); diff --git a/src/main/resources/dark.css b/src/main/resources/dark.css index 62ed3b8..3b1c62c 100644 --- a/src/main/resources/dark.css +++ b/src/main/resources/dark.css @@ -17,7 +17,7 @@ -fx-border-radius: 2; -fx-border-width: 2; -fx-text-fill: #ebebeb; - //-fx-effect: dropshadow(three-pass-box, #dadada, 2, 0, 0, 0); + //-fx-effect: dropshadow(three-pass-box, #5b5f62, 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, .color-picker:hover { -fx-background-color: #3c3f41; @@ -37,7 +37,7 @@ -fx-border-radius: 2; -fx-border-width: 2; -fx-text-fill: #ebebeb; - //-fx-effect: dropshadow(three-pass-box, #dadada, 2, 0, 0, 0); + //-fx-effect: dropshadow(three-pass-box, #5b5f62, 2, 0, 0, 0); } .menu-button:pressed, .button:pressed, .menu-button:pressed:hover, .button:pressed:hover, @@ -61,14 +61,14 @@ -fx-border-radius: 8; -fx-border-width: 1; -fx-text-fill: #ebebeb; - //-fx-effect: dropshadow(three-pass-box, #dadada, 2, 0, 0, 0); + //-fx-effect: dropshadow(three-pass-box, #5b5f62, 2, 0, 0, 0); } .button_keycap, .toggle-button_keycap { -fx-background-color: #3c3f41; -fx-background-radius: 8; -fx-background-insets: 0 0 0 0, 0, 1, 2; - -fx-border-color: #cfcfcf; + -fx-border-color: #8f8f8f; -fx-border-radius: 8; -fx-border-width: 1; -fx-text-fill: #ebebeb; @@ -85,7 +85,7 @@ -fx-effect: dropshadow(three-pass-box, #4a81dd, 2, 0, 0, 0); } .button_keycap:focused, .toggle-button_keycap:focused{ - -fx-background-color: #dadada; + -fx-background-color: #5b5f62; -fx-background-insets: 0 0 0 0, 0, 1, 2; -fx-border-color: #8f8f8f; -fx-border-radius: 8; @@ -121,7 +121,7 @@ -fx-opacity: 1.0; -fx-background-color: #412441; -fx-background-insets: 0 0 0 0, 0, 1, 2; - -fx-border-color: #f1cbf1; + -fx-border-color: #8f8f8f; -fx-border-radius: 8; -fx-background-radius: 8; -fx-border-width: 1; @@ -282,7 +282,7 @@ /* -========================== footer pane =====================- */ .footer{ -fx-background-color: #3c3f41; - -fx-border-color: #ebebeb; + -fx-border-color: #8f8f8f; -fx-border-width: 1 0 0 0; } /* -========================== header pane =====================- */