From 091fdb38b1899b7891232fb6c1adc9ed074be803 Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 1 Dec 2020 15:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/uicomponents/main/MainController.java | 5 +- client/src/main/resources/css/app-dark.css | 29 +++++++++-- client/src/main/resources/css/app-light.css | 49 ++++++++++++++----- 3 files changed, 65 insertions(+), 18 deletions(-) diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java index f7abb2b..02677dd 100644 --- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java +++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java @@ -133,7 +133,6 @@ public class MainController { rootPane.getChildren().removeAll(navigationList); rootPane.getChildren().removeAll(leftDrawer); rootPane.getChildren().removeAll(tabPane); - navigationList.setEffect(null); userLabel.textProperty().bind(ApplicatonStore.nameProperty()); roleLabel.textProperty().bind(ApplicatonStore.getRoles().asString()); userButton.textProperty().bind(ApplicatonStore.nameProperty()); @@ -210,7 +209,7 @@ public class MainController { } }); - navigationList.depthProperty().setValue(1); + navigationList.depthProperty().setValue(0); navigationList.expandedProperty().set(true); initData(); } @@ -292,11 +291,13 @@ public class MainController { for (MenuVO menuVO : childrenMenus) { listView.getItems().add(menuVO); } + listView.setExpanded(true); navigationList.getItems().add(listView); } } + } diff --git a/client/src/main/resources/css/app-dark.css b/client/src/main/resources/css/app-dark.css index 91c3cf5..6556fde 100644 --- a/client/src/main/resources/css/app-dark.css +++ b/client/src/main/resources/css/app-dark.css @@ -23,6 +23,7 @@ -fx-light-text-color: #404040; -fx-text-color: ladder(-fx-main-base, -fx-dark-text-color 29%, -fx-light-text-color 30%); + -fx-icon-svg-color: rgb(3,115,248) } @@ -464,6 +465,7 @@ .navigation-list .jfx-list-cell .label > .jfx-svg-glyph { -jfx-size: 20px; -fx-alignment: center; + -fx-background-color: -fx-icon-svg-color; } .navigation-list .jfx-list-cell:odd:selected > .jfx-rippler > StackPane, @@ -578,9 +580,9 @@ .table-view .column-header .label { -fx-alignment: center; -fx-font-family: "Microsoft YaHei"; - -fx-font-weight: BOLD; + -fx-font-weight: 300; -fx-text-fill: -fx-text-color; - -fx-font-size: 16px; + -fx-font-size: 14px; } /**TableView列头展示隐藏列按钮*/ @@ -925,8 +927,29 @@ } +/******************************************************************************* +* * +* tile * +* * +*******************************************************************************/ +.tile { + -BACKGROUND : rgb(39, 49, 66); + -FOREGROUND : rgb(223, 223, 223); + -GRAY : rgb(139,144,146); + -RED : rgb(229, 80, 76); + -LIGHT_RED : rgb(255, 84, 56); + -GREEN : rgb(143, 198, 94); + -LIGHT_GREEN : rgb(132, 228, 50); + -BLUE : rgb(55, 179, 252); + -DARK_BLUE : rgb(55, 94, 252); + -ORANGE : rgb(237, 162, 57); + -YELLOW_ORANGE : rgb(229, 198, 76); + -YELLOW : rgb(229, 229, 76); + -MAGENTA : rgb(198, 75, 232); + -PINK : rgb(233, 14, 139); - + -foreground-color: -FOREGROUND; +} .tile .chart-vertical-grid-lines { -fx-stroke : #797979; -fx-stroke-dash-array: null; diff --git a/client/src/main/resources/css/app-light.css b/client/src/main/resources/css/app-light.css index bf677cb..2a4b785 100644 --- a/client/src/main/resources/css/app-light.css +++ b/client/src/main/resources/css/app-light.css @@ -13,7 +13,7 @@ -fx-accent-suspension-color: rgba(72, 128, 255, 0.13); /*边框颜色*/ -fx-border-base: rgba(185, 185, 185, .3);; - -fx-cell-border-base: rgba(185, 185, 185, .3); + -fx-cell-border-base: rgba(185, 185, 185, 0.7); -fx-font-base14: 14px; -fx-font-base16: 16px; @@ -25,6 +25,7 @@ -fx-light-text-color: #404040; -fx-text-color: ladder(-fx-main-base, -fx-dark-text-color 29%, -fx-light-text-color 30%); + -fx-icon-svg-color: rgb(3,115,248) } @@ -121,7 +122,7 @@ -fx-text-fill: -fx-text-color; -fx-background-insets: 0; -fx-background-color: -fx-bar-base; - -fx-border-color: rgba(207, 207, 207, 0.11); + -fx-border-color: rgba(207, 207, 207, 0.5); -fx-background-radius: 14 0 0 14; -fx-border-radius: 14 0 0 14; -fx-padding: 0.333333em 0.666667em 0.333333em 0.75em; /* 4 8 4 9 */ @@ -130,7 +131,7 @@ .center-pill { -fx-text-fill: -fx-text-color; -fx-background-color: -fx-bar-base; - -fx-border-color: rgba(207, 207, 207, 0.11); + -fx-border-color: rgba(207, 207, 207, 0.5); -fx-border-width: 1 1 1 0; -fx-background-radius: 0; -fx-background-insets: 0; @@ -139,7 +140,7 @@ .right-pill { -fx-text-fill: -fx-text-color; -fx-background-color: -fx-bar-base; - -fx-border-color: rgba(207, 207, 207, 0.11); + -fx-border-color: rgba(207, 207, 207, 0.5); -fx-background-radius: 0 14 14 0; -fx-border-radius: 0 14 14 0; -fx-border-width: 1 1 1 0; @@ -148,7 +149,7 @@ } .left-pill:hover { - -fx-background-color: derive(-fx-bar-base, 20%) + -fx-background-color: derive(-fx-bar-base, -20%) } .left-pill:focused { @@ -157,7 +158,7 @@ } .left-pill:pressed { - -fx-background-color: derive(-fx-bar-base, 30%) + -fx-background-color: derive(-fx-bar-base, -30%) } .center-pill:focused { @@ -166,11 +167,11 @@ } .center-pill:hover { - -fx-background-color: derive(-fx-bar-base, 20%) + -fx-background-color: derive(-fx-bar-base, -20%) } .center-pill:pressed { - -fx-background-color: derive(-fx-bar-base, 30%) + -fx-background-color: derive(-fx-bar-base, -30%) } .right-pill:focused { @@ -179,11 +180,11 @@ } .right-pill:hover { - -fx-background-color: derive(-fx-bar-base, 20%) + -fx-background-color: derive(-fx-bar-base, -20%) } .right-pill:pressed { - -fx-background-color: derive(-fx-bar-base, 30%) + -fx-background-color: derive(-fx-bar-base, -30%) } .toggle-button:selected .left-pill:focused { @@ -465,6 +466,7 @@ .navigation-list .jfx-list-cell .label > .jfx-svg-glyph { -jfx-size: 20px; -fx-alignment: center; + -fx-background-color: -fx-icon-svg-color; } .navigation-list .jfx-list-cell:odd:selected > .jfx-rippler > StackPane, @@ -579,9 +581,9 @@ .table-view .column-header .label { -fx-alignment: center; -fx-font-family: "Microsoft YaHei"; - -fx-font-weight: BOLD; + -fx-font-weight: 300; -fx-text-fill: -fx-text-color; - -fx-font-size: 16px; + -fx-font-size: 14px; } /**TableView列头展示隐藏列按钮*/ @@ -923,8 +925,29 @@ } +/******************************************************************************* +* * +* tile * +* * +*******************************************************************************/ +.tile { + -BACKGROUND : rgb(255, 255, 255); + -FOREGROUND : rgb(52, 52, 52); + -GRAY : rgb(139,144,146); + -RED : rgb(229, 80, 76); + -LIGHT_RED : rgb(255, 84, 56); + -GREEN : rgb(143, 198, 94); + -LIGHT_GREEN : rgb(132, 228, 50); + -BLUE : rgb(55, 179, 252); + -DARK_BLUE : rgb(55, 94, 252); + -ORANGE : rgb(237, 162, 57); + -YELLOW_ORANGE : rgb(229, 198, 76); + -YELLOW : rgb(229, 229, 76); + -MAGENTA : rgb(198, 75, 232); + -PINK : rgb(233, 14, 139); - + -foreground-color: -FOREGROUND; +} .tile .chart-vertical-grid-lines { -fx-stroke : #9d9d9d; -fx-stroke-dash-array: null;