desu/konogonka
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

UI updates

Browse source
This commit is contained in:
Dmitry Isaenko 2019-09-19 01:24:51 +03:00
parent ead20d3264
commit 1bf89a2358
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/resources/FXML/landingPage.fxml
View file

@ -14,7 +14,7 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.SVGPath?> <?import javafx.scene.shape.SVGPath?>
<AnchorPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="konogonka.Controllers.MainController"> <AnchorPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="konogonka.Controllers.MainController">
<children> <children>
<VBox layoutX="10.0" layoutY="10.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <VBox layoutX="10.0" layoutY="10.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children> <children>
@ -45,7 +45,7 @@
</ToolBar> </ToolBar>
<SplitPane fx:id="splitPane" dividerPositions="0.5" VBox.vgrow="ALWAYS"> <SplitPane fx:id="splitPane" dividerPositions="0.5" VBox.vgrow="ALWAYS">
<items> <items>
<TabPane fx:id="tabPane" side="LEFT" tabClosingPolicy="UNAVAILABLE" tabMinHeight="35.0" tabMinWidth="25.0" > <TabPane fx:id="tabPane" side="LEFT" tabClosingPolicy="UNAVAILABLE" tabMinHeight="35.0" tabMinWidth="25.0">
<tabs> <tabs>
<Tab closable="false"> <Tab closable="false">
<content> <content>
@ -63,7 +63,7 @@
<Label text="XCI" /> <Label text="XCI" />
</graphic> </graphic>
</Tab> </Tab>
<Tab closable="false"> <Tab closable="false" styleClass="tab-sub">
<content> <content>
<fx:include fx:id="NCATab" source="NCA/NCATab.fxml" /> <fx:include fx:id="NCATab" source="NCA/NCATab.fxml" />
</content> </content>
@ -71,7 +71,7 @@
<Label text="NCA" /> <Label text="NCA" />
</graphic> </graphic>
</Tab> </Tab>
<Tab closable="false"> <Tab closable="false" styleClass="tab-sub">
<content> <content>
<fx:include fx:id="TIKTab" source="TIK/TIKTab.fxml" /> <fx:include fx:id="TIKTab" source="TIK/TIKTab.fxml" />
</content> </content>
@ -79,7 +79,7 @@
<Label text="TIK" /> <Label text="TIK" />
</graphic> </graphic>
</Tab> </Tab>
<Tab closable="false"> <Tab closable="false" styleClass="tab-sub">
<content> <content>
<fx:include fx:id="XMLTab" source="XML/XMLTab.fxml" /> <fx:include fx:id="XMLTab" source="XML/XMLTab.fxml" />
</content> </content>
@ -87,7 +87,7 @@
<Label text="XML" /> <Label text="XML" />
</graphic> </graphic>
</Tab> </Tab>
<Tab closable="false"> <Tab closable="false" styleClass="tab-sub">
<content> <content>
<fx:include fx:id="NPDMTab" source="NPDM/NPDMTab.fxml" /> <fx:include fx:id="NPDMTab" source="NPDM/NPDMTab.fxml" />
</content> </content>

27
src/main/resources/res/app_light.css
View file

@ -221,7 +221,7 @@
*/ */
// -======================== TAB PANE =========================- // -======================== TAB PANE =========================-
.tab-pane .tab SVGPath{ .tab-pane .tab SVGPath{
-fx-fill: #2c2c2c; // OK -fx-fill: #2c2c2c;
} }
.tab-pane .tab:selected SVGPath, .tab-pane .tab:hover SVGPath{ .tab-pane .tab:selected SVGPath, .tab-pane .tab:hover SVGPath{
-fx-fill: #ffffff; -fx-fill: #ffffff;
@ -231,7 +231,7 @@
-fx-text-fill: #2c2c2c; -fx-text-fill: #2c2c2c;
} }
.tab-pane .tab{ .tab-pane .tab{
-fx-background-color: #f5f5f5; //ok -fx-background-color: #f5f5f5;
-fx-focus-color: transparent; -fx-focus-color: transparent;
-fx-faint-focus-color: transparent; -fx-faint-focus-color: transparent;
-fx-background-radius: 5; -fx-background-radius: 5;
@ -240,7 +240,7 @@
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
} }
.tab-pane .tab:selected{ .tab-pane .tab:selected{
-fx-background-color: #007cad; // OK -fx-background-color: #007cad;
-fx-focus-color: transparent; -fx-focus-color: transparent;
-fx-faint-focus-color: transparent; -fx-faint-focus-color: transparent;
-fx-background-radius: 5; -fx-background-radius: 5;
@ -249,7 +249,7 @@
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
} }
.tab-pane .tab:hover{ .tab-pane .tab:hover{
-fx-background-color: #0d98ba; // OK -fx-background-color: #0d98ba;
-fx-focus-color: transparent; -fx-focus-color: transparent;
-fx-faint-focus-color: transparent; -fx-faint-focus-color: transparent;
-fx-background-radius: 5; -fx-background-radius: 5;
@ -261,13 +261,28 @@
.tab-pane > .tab-header-area > .tab-header-background .tab-pane > .tab-header-area > .tab-header-background
{ {
-fx-background-color: #f5f5f5; // OK -fx-background-color: #f5f5f5;
-fx-border-width: 0 0 1 0; -fx-border-width: 0 0 1 0;
-fx-border-color: #959595; // OK -fx-border-color: #959595;
} }
.tab-pane > .tab-header-area > .headers-region > .tab { .tab-pane > .tab-header-area > .headers-region > .tab {
-fx-padding: 10; -fx-padding: 10;
} }
// Special colors for in-file sub-files
.tab-pane .tab-sub:selected{
-fx-background-color: #b90078;
-fx-focus-color: transparent;
-fx-faint-focus-color: transparent;
-fx-background-radius: 5;
}
.tab-pane .tab-sub:hover{
-fx-background-color: #df0091;
-fx-focus-color: transparent;
-fx-faint-focus-color: transparent;
-fx-background-radius: 5;
}
// -=========================== TABLE ======================- // -=========================== TABLE ======================-
.table-view { .table-view {
-fx-background-color: #fefefe; -fx-background-color: #fefefe;