diff --git a/client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java b/client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java
index f8377cf..3135a4c 100644
--- a/client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java
+++ b/client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java
@@ -273,7 +273,7 @@ public class HomeController {
.skinType(Tile.SkinType.WORLDMAP).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("WorldMap Tile")
.text("Whatever text")
- .textVisible(false)
+ .textVisible(false).shadowsEnabled(true)
.build();
@@ -282,7 +282,7 @@ public class HomeController {
.title("RadialChart")
.text("Some text")
.textVisible(false)
- .chartData(chartData1, chartData2, chartData3, chartData4)
+ .chartData(chartData1, chartData2, chartData3, chartData4).shadowsEnabled(true)
.build();
donutChartTile = TileBuilder.create()
@@ -437,6 +437,7 @@ public class HomeController {
((Tile) node).setBackgroundColor(BACKGROUND_DARK);
((Tile) node).setBorderColor(BORDERCOLOR_DARK);
((Tile) node).setForegroundBaseColor(FOREGROUND_DARK);
+ ((Tile) node).setShadowsEnabled(true);
((Tile) node).getChartData().forEach(chartData -> {
chartData.setTextColor(FOREGROUND_DARK);
});
@@ -445,7 +446,7 @@ public class HomeController {
((Tile) node).setBackgroundColor(BACKGROUND_LIGHT);
((Tile) node).setBorderColor(BORDERCOLOR_LIGHT);
((Tile) node).setForegroundBaseColor(FOREGROUND_LIGHT);
-
+ ((Tile) node).setShadowsEnabled(true);
((Tile) node).getChartData().forEach(chartData -> {
chartData.setTextColor(FOREGROUND_LIGHT);
});
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 0b00cc7..34407e9 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
@@ -139,7 +139,7 @@ public class MainController {
userButton.textProperty().bind(ApplicatonStore.nameProperty());
try {
homeButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".home-outline"));
- refreshButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".shuaxin"));
+ refreshButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".shuaxin1"));
rolesBut.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".admin"));
userButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".ChevronDownCircle"));
} catch (Exception e) {
diff --git a/client/src/main/resources/css/app-dark.css b/client/src/main/resources/css/app-dark.css
index 3e890cf..c4fe154 100644
--- a/client/src/main/resources/css/app-dark.css
+++ b/client/src/main/resources/css/app-dark.css
@@ -31,6 +31,10 @@
-fx-background-color: -fx-card-base;
}
+.tool-pane{
+ -fx-border-color: -fx-border-base;
+ -fx-border-width: 0 0 0.45 0;
+}
.jfx-svg-glyph {
-fx-background-color: -fx-text-color;
}
@@ -43,9 +47,11 @@
-fx-background-color: -fx-card-base;
-fx-padding: 10;
-fx-background-radius: 14px;
- -fx-border-color: #313D4F;
+ -fx-border-color: transparent;
-fx-border-width: 1px;
-fx-border-radius: 14px;
+ -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.56), 12, 0, 0, 0);
+
}
@@ -104,6 +110,7 @@
-fx-background-color: -fx-accent-color;
-fx-text-fill: -fx-text-color;
-jfx-button-type: RAISED;
+
}
.jfx-button > MaterialDesignIconView, .toggle-button > MaterialDesignIconView {
@@ -949,6 +956,8 @@
-PINK : rgb(233, 14, 139);
-foreground-color: -FOREGROUND;
+ -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.56), 12, 0, 0, 0);
+
}
.tile .chart-vertical-grid-lines {
-fx-stroke : #797979;
diff --git a/client/src/main/resources/css/app-light.css b/client/src/main/resources/css/app-light.css
index b63453e..487d3de 100644
--- a/client/src/main/resources/css/app-light.css
+++ b/client/src/main/resources/css/app-light.css
@@ -25,7 +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)
+ -fx-icon-svg-color: rgb(3, 115, 248)
}
@@ -33,6 +33,11 @@
-fx-background-color: -fx-card-base;
}
+.tool-pane{
+ -fx-border-color: -fx-border-base;
+ -fx-border-width: 0 0 0.45 0;
+}
+
.jfx-svg-glyph {
-fx-background-color: -fx-text-color;
}
@@ -45,17 +50,19 @@
-fx-background-color: -fx-card-base;
-fx-padding: 10;
-fx-background-radius: 14px;
- -fx-border-color: -fx-border-base;
+ -fx-border-color: transparent;
-fx-border-width: 1px;
-fx-border-radius: 14px;
+ -fx-effect: dropshadow(gaussian, #8f959c, 12, 0.2, 0, 0);
+
}
-
-/*******************************************************************************
-* *
-* text和label *
-* *
-*******************************************************************************/
+.
+ /*******************************************************************************
+ * *
+ * text和label *
+ * *
+ *******************************************************************************/
.label {
-fx-text-fill: -fx-text-color;
-fx-font-family: "Microsoft YaHei";
@@ -106,6 +113,7 @@
-fx-background-color: -fx-accent-color;
-fx-text-fill: -fx-text-color;
-jfx-button-type: RAISED;
+
}
.jfx-button > MaterialDesignIconView, .toggle-button > MaterialDesignIconView {
@@ -114,7 +122,8 @@
-fx-prompt-text-fill: -fx-text-color;
-jfx-size: 16px;
}
-.jfx-toggle-button{
+
+.jfx-toggle-button {
-fx-text-fill: -fx-text-color;
}
@@ -492,7 +501,7 @@
-jfx-rippler-fill: derive(-fx-accent-color, -20%);
}
-#navigation-menu{
+#navigation-menu {
-fx-background-color: #F9F9F9;
}
@@ -935,35 +944,39 @@
* *
*******************************************************************************/
.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);
+ -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;
+
+ -fx-effect: dropshadow(gaussian, #8f959c, 12, 0, 0, 0);
+
}
+
.tile .chart-vertical-grid-lines {
- -fx-stroke : #9d9d9d;
+ -fx-stroke: #9d9d9d;
-fx-stroke-dash-array: null;
}
.tile .chart-horizontal-grid-lines {
- -fx-stroke : #9d9d9d;
+ -fx-stroke: #9d9d9d;
-fx-stroke-dash-array: null;
}
.tile .axis {
- AXIS_COLOR : #454545;
+ AXIS_COLOR: #454545;
-fx-tick-label-fill: #454545;
}
diff --git a/client/src/main/resources/fonts/icon_font/iconfont.svg b/client/src/main/resources/fonts/icon_font/iconfont.svg
index 723670c..f75a2dc 100644
--- a/client/src/main/resources/fonts/icon_font/iconfont.svg
+++ b/client/src/main/resources/fonts/icon_font/iconfont.svg
@@ -20,6 +20,12 @@ Created by iconfont
/>
+
+
+
+
+
+
diff --git a/client/src/main/resources/fxml/admin/group/components/group_detail.fxml b/client/src/main/resources/fxml/admin/group/components/group_detail.fxml
index 4912eab..17dc753 100644
--- a/client/src/main/resources/fxml/admin/group/components/group_detail.fxml
+++ b/client/src/main/resources/fxml/admin/group/components/group_detail.fxml
@@ -42,15 +42,15 @@
-
+
-
+
-
+
@@ -101,9 +101,6 @@
-
-
-
diff --git a/client/src/main/resources/fxml/admin/menu/menu_management.fxml b/client/src/main/resources/fxml/admin/menu/menu_management.fxml
index d7bf0c7..495af69 100644
--- a/client/src/main/resources/fxml/admin/menu/menu_management.fxml
+++ b/client/src/main/resources/fxml/admin/menu/menu_management.fxml
@@ -22,108 +22,124 @@
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -138,19 +154,20 @@
-
+
-
+
-
-
-
+
+
+
-
+
diff --git a/client/src/main/resources/fxml/main/main.fxml b/client/src/main/resources/fxml/main/main.fxml
index aacace6..c50aaf2 100644
--- a/client/src/main/resources/fxml/main/main.fxml
+++ b/client/src/main/resources/fxml/main/main.fxml
@@ -32,42 +32,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
diff --git a/client/src/main/resources/fxml/power.fxml b/client/src/main/resources/fxml/power.fxml
new file mode 100644
index 0000000..a6b7fd8
--- /dev/null
+++ b/client/src/main/resources/fxml/power.fxml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+