Unify the font of tab header

This commit is contained in:
huangyuhui 2018-02-14 01:19:29 +08:00
parent a237ca799f
commit 123d9b791c
4 changed files with 29 additions and 15 deletions

View File

@ -168,7 +168,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
if (!min) buttonsContainer.getChildren().remove(btnMin); if (!min) buttonsContainer.getChildren().remove(btnMin);
if (!max) buttonsContainer.getChildren().remove(btnMax); 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_ENTERED, e -> allowMove = true);
titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> { titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> {
if (!isDragging) allowMove = false; if (!isDragging) allowMove = false;

View File

@ -1,5 +1,5 @@
.root { .root {
-fx-base-color: #3F51B5; -fx-base-color: #5c6bc0;
-fx-base-check-color: derive(-fx-base-color, 30%); -fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: white; -fx-base-text-fill: white;
} }

View File

@ -76,13 +76,22 @@
} }
.tab-selected-line { .tab-selected-line {
-fx-background-color: -fx-base-color; -fx-background-color: derive(-fx-base-color, -30%);
} }
.jfx-tab-pane .jfx-rippler { .jfx-tab-pane .jfx-rippler {
-jfx-rippler-fill: white; -jfx-rippler-fill: white;
} }
.tab-label {
-fx-font-family: "Roboto";
-fx-font-size: 16;
}
.tab-label {
-fx-padding: 10 17 10 17;
}
/******************************************************************************* /*******************************************************************************
* * * *
* JFX Drawer * * JFX Drawer *
@ -792,11 +801,16 @@
} }
.toggle-icon3 { .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-background-radius: 50px;
-fx-pref-height: 5px;
-fx-background-color: transparent; -fx-background-color: transparent;
-jfx-toggle-color: -fx-base-check-color; -jfx-toggle-color: white;
-jfx-untoggle-color: transparent; -jfx-untoggle-color: transparent;
} }

View File

@ -22,27 +22,27 @@
</Tab> </Tab>
</JFXTabPane> </JFXTabPane>
<HBox alignment="TOP_RIGHT" style="-fx-padding: 3px;" pickOnBounds="false"> <HBox alignment="TOP_RIGHT" style="-fx-padding: 2 2 2 2;" spacing="3" pickOnBounds="false">
<JFXButton fx:id="btnDelete" maxHeight="28.0" minHeight="28.0" onMouseClicked="#onDelete" <JFXButton fx:id="btnDelete" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onDelete"
styleClass="toggle-icon3" ripplerFill="white"> styleClass="toggle-icon3">
<graphic> <graphic>
<fx:include source="/assets/svg/delete-white.fxml"/> <fx:include source="/assets/svg/delete-white.fxml"/>
</graphic> </graphic>
</JFXButton> </JFXButton>
<JFXButton fx:id="btnExport" maxHeight="28.0" minHeight="28.0" onMouseClicked="#onExport" <JFXButton fx:id="btnExport" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onExport"
styleClass="toggle-icon3" ripplerFill="white"> styleClass="toggle-icon3">
<graphic> <graphic>
<fx:include source="/assets/svg/export.fxml"/> <fx:include source="/assets/svg/export.fxml"/>
</graphic> </graphic>
</JFXButton> </JFXButton>
<JFXButton fx:id="btnBrowseMenu" maxHeight="28.0" minHeight="28.0" onMouseClicked="#onBrowseMenu" <JFXButton fx:id="btnBrowseMenu" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onBrowseMenu"
styleClass="toggle-icon3" ripplerFill="white"> styleClass="toggle-icon3">
<graphic> <graphic>
<fx:include source="/assets/svg/folder-open.fxml"/> <fx:include source="/assets/svg/folder-open.fxml"/>
</graphic> </graphic>
</JFXButton> </JFXButton>
<JFXButton fx:id="btnManagementMenu" maxHeight="28.0" minHeight="28.0" onMouseClicked="#onManagementMenu" <JFXButton fx:id="btnManagementMenu" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onManagementMenu"
styleClass="toggle-icon3" ripplerFill="white"> styleClass="toggle-icon3">
<graphic> <graphic>
<fx:include source="/assets/svg/wrench-white.fxml"/> <fx:include source="/assets/svg/wrench-white.fxml"/>
</graphic> </graphic>