diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java index 4fdf822c5..d20c7a120 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java @@ -168,7 +168,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza if (!min) buttonsContainer.getChildren().remove(btnMin); if (!max) buttonsContainer.getChildren().remove(btnMax); - JFXDepthManager.setDepth(titleContainer, 1); + //JFXDepthManager.setDepth(titleContainer, 1); titleContainer.addEventHandler(MouseEvent.MOUSE_ENTERED, e -> allowMove = true); titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> { if (!isDragging) allowMove = false; diff --git a/HMCL/src/main/resources/assets/css/blue.css b/HMCL/src/main/resources/assets/css/blue.css index 7059f605b..7e02d2eb4 100644 --- a/HMCL/src/main/resources/assets/css/blue.css +++ b/HMCL/src/main/resources/assets/css/blue.css @@ -1,5 +1,5 @@ .root { - -fx-base-color: #3F51B5; + -fx-base-color: #5c6bc0; -fx-base-check-color: derive(-fx-base-color, 30%); -fx-base-text-fill: white; } \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 7764fea64..805d01241 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -76,13 +76,22 @@ } .tab-selected-line { - -fx-background-color: -fx-base-color; + -fx-background-color: derive(-fx-base-color, -30%); } .jfx-tab-pane .jfx-rippler { -jfx-rippler-fill: white; } +.tab-label { + -fx-font-family: "Roboto"; + -fx-font-size: 16; +} + +.tab-label { + -fx-padding: 10 17 10 17; +} + /******************************************************************************* * * * JFX Drawer * @@ -792,11 +801,16 @@ } .toggle-icon3 { - -fx-pref-width: 5px; + -fx-toggle-icon4-size: 35px; + -fx-pref-width: -fx-toggle-icon4-size; + -fx-max-width: -fx-toggle-icon4-size; + -fx-min-width: -fx-toggle-icon4-size; + -fx-pref-height: -fx-toggle-icon4-size; + -fx-max-height: -fx-toggle-icon4-size; + -fx-min-height: -fx-toggle-icon4-size; -fx-background-radius: 50px; - -fx-pref-height: 5px; -fx-background-color: transparent; - -jfx-toggle-color: -fx-base-check-color; + -jfx-toggle-color: white; -jfx-untoggle-color: transparent; } diff --git a/HMCL/src/main/resources/assets/fxml/version/version.fxml b/HMCL/src/main/resources/assets/fxml/version/version.fxml index 092177374..cbb876f00 100644 --- a/HMCL/src/main/resources/assets/fxml/version/version.fxml +++ b/HMCL/src/main/resources/assets/fxml/version/version.fxml @@ -22,27 +22,27 @@ - - + + - + - + - +