修改一些细节

client/src/main/java/com/epri/fx/client/gui/uicomponents/main/MainController.java

@@ -66,8 +66,7 @@ public class MainController {
     @ActionHandler
     private FlowActionHandler actionHandler;
 
-    @FXML
-    private JFXToolbar toolBar;    //工具栏
+
     @FXML
     private StackPane rootPane;
     @FXML

client/src/main/resources/css/app-dark.css

@@ -28,7 +28,7 @@
 }
 
 .backgroundPane {
-    -fx-background-color: -fx-main-base;
+    -fx-background-color: -fx-card-base;
 }
 
 .jfx-svg-glyph {
@@ -209,7 +209,7 @@
 *******************************************************************************/
 
 .lfx-decorator {
-    -fx-decorator-color: -fx-card-base;
+    -fx-decorator-color: -fx-main-base;
     -fx-background-color: transparent;
 
 }
@@ -336,7 +336,7 @@
 
 
 .jfx-tab-pane .tab-header-background {
-    -fx-background-color: -fx-main-base;
+    -fx-background-color: -fx-card-base;
 }
 
 .jfx-tab-pane .headers-region .tab-selected-line {
@@ -406,9 +406,9 @@
     -fx-background-color: -fx-accent-suspension-color;
 }
 
-/*.tab-content {*/
-/*    -fx-background-color: -fx-card-base;*/
-/*}*/
+.tab-content {
+    -fx-background-color: -fx-main-base;
+}
 
 /*******************************************************************************
 *                                                                              *

client/src/main/resources/css/app-light.css

@@ -30,7 +30,7 @@
 }
 
 .backgroundPane {
-    -fx-background-color: -fx-main-base;
+    -fx-background-color: -fx-card-base;
 }
 
 .jfx-svg-glyph {
@@ -337,7 +337,7 @@
 
 
 .jfx-tab-pane .tab-header-background {
-    -fx-background-color: -fx-main-base;
+    -fx-background-color: -fx-card-base;
 }
 
 .jfx-tab-pane .headers-region .tab-selected-line {
@@ -407,9 +407,9 @@
     -fx-background-color: -fx-accent-suspension-color;
 }
 
-/*.tab-content {*/
-/*    -fx-background-color: -fx-card-base;*/
-/*}*/
+.tab-content {
+    -fx-background-color: -fx-main-base;
+}
 
 /*******************************************************************************
 *                                                                              *
@@ -492,6 +492,10 @@
     -jfx-rippler-fill: derive(-fx-accent-color, -20%);
 }
 
+#navigation-menu{
+    -fx-background-color: #F9F9F9;
+}
+
 
 /*******************************************************************************
 *                                                                              *

client/src/main/resources/fxml/main/main.fxml

@@ -6,10 +6,8 @@
 <?import com.jfoenix.controls.JFXDrawersStack?>
 <?import com.jfoenix.controls.JFXHamburger?>
 <?import com.jfoenix.controls.JFXListView?>
-<?import com.jfoenix.controls.JFXRippler?>
 <?import com.jfoenix.controls.JFXTabPane?>
 <?import com.jfoenix.controls.JFXToggleButton?>
-<?import com.jfoenix.controls.JFXToolbar?>
 <?import com.jfoenix.transitions.hamburger.HamburgerSlideCloseTransition?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
@@ -34,44 +32,29 @@
 
         <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="400.0" prefWidth="600.0">
             <children>
-
-                <JFXToolbar fx:id="toolBar" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="45.0" styleClass="app-tool-bar" VBox.vgrow="ALWAYS">
-                    <leftItems>
-                        <HBox alignment="CENTER_LEFT">
-                            <JFXRippler maskType="CIRCLE" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0">
-                                <control>
-                                    <StackPane fx:id="titleBurgerContainer">
-                                        <children>
-                                            <JFXHamburger fx:id="navigationButton">
-                                                <animation>
-                                                    <HamburgerSlideCloseTransition />
-                                                </animation>
-                                                <padding>
-                                                    <Insets left="5.0" />
-                                                </padding>
-                                            </JFXHamburger>
-                                        </children>
-                                    </StackPane>
-                                </control>
-                            </JFXRippler>
-                            <JFXButton fx:id="homeButton" contentDisplay="GRAPHIC_ONLY" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="tool-bar-button" />
-                            <JFXButton fx:id="refreshButton" contentDisplay="GRAPHIC_ONLY" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="tool-bar-button" />
-                            <JFXDatePicker fx:id="datePicker" editable="false" maxWidth="150">
-                                <HBox.margin>
-                                    <Insets />
-                                </HBox.margin>
-                                <padding>
-                                    <Insets bottom="7.0" />
-                                </padding>
-                            </JFXDatePicker>
-                        </HBox>
+            <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="50.0" spacing="5.0" VBox.vgrow="ALWAYS">
+               <children>
+                             <JFXHamburger fx:id="navigationButton" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="40.0" prefWidth="40.0">
+                                 <animation>
+                                     <HamburgerSlideCloseTransition />
+                                 </animation>
+                                 <padding>
+                                     <Insets left="5.0" />
+                                 </padding>
+                             </JFXHamburger>
+                         <JFXButton fx:id="homeButton" contentDisplay="GRAPHIC_ONLY" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="tool-bar-button" />
+                         <JFXButton fx:id="refreshButton" contentDisplay="GRAPHIC_ONLY" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="tool-bar-button" />
+                         <JFXDatePicker fx:id="datePicker" editable="false" maxWidth="150">
+                             <HBox.margin>
+                                 <Insets />
+                             </HBox.margin>
+                             <padding>
+                                 <Insets bottom="7.0" />
+                             </padding>
+                         </JFXDatePicker>
 
 
-                    </leftItems>
-                    <rightItems>
-
-
-                        <HBox alignment="CENTER">
+                        <HBox alignment="CENTER_RIGHT" spacing="5.0" HBox.hgrow="ALWAYS">
                      <JFXToggleButton fx:id="styleBut" text="暗色" />
                             <JFXButton fx:id="rolesBut" contentDisplay="GRAPHIC_ONLY" maxHeight="40.0" maxWidth="40.0" minHeight="40.0" minWidth="40.0" prefHeight="40.0" prefWidth="40.0" styleClass="tool-bar-button" text="user" textFill="WHITE" />
                             <VBox alignment="CENTER">
@@ -79,20 +62,15 @@
                                 <Label fx:id="roleLabel" maxWidth="1.7976931348623157E308" style="-fx-font-size: 10;" text="管理员" VBox.vgrow="ALWAYS" />
                             </VBox>
                             <JFXButton fx:id="userButton" contentDisplay="GRAPHIC_ONLY" maxHeight="20.0" maxWidth="20.0" minHeight="20.0" minWidth="20.0" prefHeight="20.0" prefWidth="20.0" styleClass="tool-bar-button" text="user" textFill="WHITE" />
-                            <padding>
-                                <Insets bottom="0" left="0.0" right="10.0" top="0.0" />
-                            </padding>
+                     <padding>
+                        <Insets right="5.0" />
+                     </padding>
                         </HBox>
-
-
-                    </rightItems>
-               <padding>
-                  <Insets left="10.0" right="10.0" />
-               </padding>
-                </JFXToolbar>
+               </children>
+            </HBox>
 
                 <JFXDrawersStack fx:id="drawersStack" VBox.vgrow="ALWAYS" />
-                <JFXDrawer fx:id="leftDrawer" defaultDrawerSize="240.0" overLayVisible="false" />
+                <JFXDrawer id="navigation-menu" fx:id="leftDrawer" defaultDrawerSize="240.0" overLayVisible="false" />
                 <JFXTabPane fx:id="tabPane" />
                 <JFXListView fx:id="navigationList" maxWidth="-Infinity" minWidth="240.0" prefWidth="240.0" styleClass="navigation-list" />