Skip to content

Commit

Permalink
Change font and colour of the whole UI
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisaditya17 committed Oct 15, 2024
1 parent 7c12560 commit 0c0d8f5
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 60 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/view/CommandBox.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.StackPane?>

<StackPane styleClass="stack-pane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<StackPane styleClass="stack-pane-2" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
</StackPane>

90 changes: 46 additions & 44 deletions src/main/resources/view/DarkTheme.css
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@

.background {
-fx-background-color: derive(#1d1d1d, 20%);
background-color: #383838; /* Used in the default.html file */
-fx-background-color: derive(#031926, 20%);
background-color: derive(#031926, 10%);/* Used in the default.html file */
}

.label {
-fx-font-size: 11pt;
-fx-font-family: "Segoe UI Semibold";
-fx-font-family: "PT Serif";
-fx-text-fill: #555555;
-fx-opacity: 0.9;
}

.label-bright {
-fx-font-size: 11pt;
-fx-font-family: "Segoe UI Semibold";
-fx-font-family: "PT Serif";
-fx-text-fill: white;
-fx-opacity: 1;
}

.label-header {
-fx-font-size: 32pt;
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif Bold";
-fx-text-fill: white;
-fx-opacity: 1;
}

.text-field {
-fx-font-size: 12pt;
-fx-font-family: "Segoe UI Semibold";
-fx-font-family: "PT Serif Bold";
}

.tab-pane {
Expand All @@ -41,8 +42,8 @@

.table-view {
-fx-base: #1d1d1d;
-fx-control-inner-background: #1d1d1d;
-fx-background-color: #1d1d1d;
-fx-control-inner-background: derive(#031926, 10%);
-fx-background-color: derive(#031926, 10%);
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
Expand All @@ -66,7 +67,7 @@

.table-view .column-header .label {
-fx-font-size: 20pt;
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif";
-fx-text-fill: white;
-fx-alignment: center-left;
-fx-opacity: 1;
Expand All @@ -77,20 +78,20 @@
}

.split-pane:horizontal .split-pane-divider {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 20%);
-fx-border-color: transparent transparent transparent #4d4d4d;
}

.split-pane {
-fx-border-radius: 1;
-fx-border-width: 1;
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 20%);
}

.list-view {
-fx-background-insets: 0;
-fx-padding: 0;
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 20%);
}

.list-cell {
Expand All @@ -100,19 +101,20 @@
}

.list-cell:filled:even {
-fx-background-color: #3c3e3f;
-fx-background-color: derive(#77ACA2, -10%);

}

.list-cell:filled:odd {
-fx-background-color: #515658;
-fx-background-color: derive(#77ACA2, -30%);
}

.list-cell:filled:selected {
-fx-background-color: #424d5f;
-fx-background-color: derive(#77ACA2, -50%);
}

.list-cell:filled:selected #cardPane {
-fx-border-color: #3e7b91;
-fx-border-color: derive(#77ACA2, -50%);
-fx-border-width: 1;
}

Expand All @@ -121,34 +123,34 @@
}

.cell_big_label {
-fx-font-family: "Segoe UI Semibold";
-fx-font-family: "PT Serif Semibold";
-fx-font-size: 16px;
-fx-text-fill: #010504;
}

.cell_small_label {
-fx-font-family: "Segoe UI";
-fx-font-family: "PT Serif";
-fx-font-size: 13px;
-fx-text-fill: #010504;
}

.stack-pane {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 10%);
}

.pane-with-border {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-border-color: derive(#1d1d1d, 10%);
-fx-background-color: derive(#031926, 10%);
-fx-border-color: derive(#031926, 10%);
-fx-border-top-width: 1px;
}

.status-bar {
-fx-background-color: derive(#1d1d1d, 30%);
-fx-background-color: derive(#031926, 10%);
}

.result-display {
-fx-background-color: transparent;
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif";
-fx-font-size: 13pt;
-fx-text-fill: white;
}
Expand All @@ -158,15 +160,15 @@
}

.status-bar .label {
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif";
-fx-text-fill: white;
-fx-padding: 4px;
-fx-pref-height: 30px;
}

.status-bar-with-border {
-fx-background-color: derive(#1d1d1d, 30%);
-fx-border-color: derive(#1d1d1d, 25%);
-fx-background-color: derive(#031926, 50%);
-fx-border-color: derive(#031926, 10%);
-fx-border-width: 1px;
}

Expand All @@ -176,29 +178,29 @@

.grid-pane {
-fx-background-color: derive(#1d1d1d, 30%);
-fx-border-color: derive(#1d1d1d, 30%);
-fx-border-color: derive(#031926, 10%);
-fx-border-width: 1px;
}

.grid-pane .stack-pane {
-fx-background-color: derive(#1d1d1d, 30%);
-fx-background-color: derive(#031926, 20%);
}

.context-menu {
-fx-background-color: derive(#1d1d1d, 50%);
-fx-background-color: derive(#031926, 20%);
}

.context-menu .label {
-fx-text-fill: white;
}

.menu-bar {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 10%);
}

.menu-bar .label {
-fx-font-size: 14pt;
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif";
-fx-text-fill: white;
-fx-opacity: 0.9;
}
Expand All @@ -218,14 +220,14 @@
-fx-border-width: 2;
-fx-background-radius: 0;
-fx-background-color: #1d1d1d;
-fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
-fx-font-family: "PT Serif, sans-serif";
-fx-font-size: 11pt;
-fx-text-fill: #d8d8d8;
-fx-background-insets: 0 0 0 0, 0, 1, 2;
}

.button:hover {
-fx-background-color: #3a3a3a;
-fx-background-color: derive(#031926, 10%);
}

.button:pressed, .button:default:hover:pressed {
Expand All @@ -243,25 +245,25 @@

.button:disabled, .button:default:disabled {
-fx-opacity: 0.4;
-fx-background-color: #1d1d1d;
-fx-background-color: derive(#031926, 10%);
-fx-text-fill: white;
}

.button:default {
-fx-background-color: -fx-focus-color;
-fx-text-fill: #ffffff;
-fx-text-fill: derive(#031926, 10%);
}

.button:default:hover {
-fx-background-color: derive(-fx-focus-color, 30%);
}

.dialog-pane {
-fx-background-color: #1d1d1d;
-fx-background-color: derive(#031926, 10%);
}

.dialog-pane > *.button-bar > *.container {
-fx-background-color: #1d1d1d;
-fx-background-color: derive(#031926, 10%);
}

.dialog-pane > *.label.content {
Expand All @@ -271,7 +273,7 @@
}

.dialog-pane:header *.header-panel {
-fx-background-color: derive(#1d1d1d, 25%);
-fx-background-color: derive(#031926, 20%);
}

.dialog-pane:header *.header-panel *.label {
Expand All @@ -282,16 +284,16 @@
}

.scroll-bar {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 20%);
}

.scroll-bar .thumb {
-fx-background-color: derive(#1d1d1d, 50%);
-fx-background-color: derive(#031926, 50%);
-fx-background-insets: 3;
}

.scroll-bar .increment-button, .scroll-bar .decrement-button {
-fx-background-color: transparent;
-fx-background-color: derive(#031926, 20%);
-fx-padding: 0 0 0 0;
}

Expand All @@ -318,12 +320,12 @@
}

#commandTextField {
-fx-background-color: transparent #383838 transparent #383838;
-fx-background-color: derive(#031926, 30%);
-fx-background-insets: 0;
-fx-border-color: #383838 #383838 #ffffff #383838;
-fx-border-insets: 0;
-fx-border-width: 1;
-fx-font-family: "Segoe UI Light";
-fx-font-family: "PT Serif";
-fx-font-size: 13pt;
-fx-text-fill: white;
}
Expand All @@ -333,7 +335,7 @@
}

#resultDisplay .content {
-fx-background-color: transparent, #383838, transparent, #383838;
-fx-background-color: derive(#031926, 30%), derive(#031926, 30%), transparent, derive(#031926, 30%);
-fx-background-radius: 0;
}

Expand Down
13 changes: 7 additions & 6 deletions src/main/resources/view/Extensions.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@

.error {
-fx-text-fill: #d06651 !important; /* The error class should always override the default text-fill style */
-fx-text-fill: #d06651 !important; /* Error color: a distinct red for error messages */
}

.list-cell:empty {
/* Empty cells will not have alternating colours */
-fx-background: #383838;
/* Empty cells will not have alternating colors */
-fx-background-color: #031926; /* Matches the dark background theme */
}

.tag-selector {
-fx-border-width: 1;
-fx-border-color: white;
-fx-border-color: #77ACA2; /* Teal color to match the theme */
-fx-border-radius: 3;
-fx-background-radius: 3;
-fx-background-color: transparent; /* Transparent background to blend with dark theme */
}

.tooltip-text {
-fx-text-fill: white;
-fx-text-fill: white; /* White text for clear readability on tooltips */
}

10 changes: 5 additions & 5 deletions src/main/resources/view/HelpWindow.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#copyButton, #helpMessage {
-fx-text-fill: white;
-fx-text-fill: white; /* Consistent white text for buttons and help message */
}

#copyButton {
-fx-background-color: dimgray;
-fx-background-color: #031926; /* Dark background for consistency */
}

#copyButton:hover {
-fx-background-color: gray;
-fx-background-color: derive(#031926, 15%); /* Slightly lighter shade for hover */
}

#copyButton:armed {
-fx-background-color: darkgray;
-fx-background-color: derive(#031926, 30%); /* Even lighter shade for armed state */
}

#helpMessageContainer {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#031926, 20%); /* Consistent dark blueish background */
}
2 changes: 1 addition & 1 deletion src/main/resources/view/PersonListPanel.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

<VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<ListView fx:id="personListView" VBox.vgrow="ALWAYS" />
</VBox>
</VBox>
5 changes: 2 additions & 3 deletions src/main/resources/view/ResultDisplay.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>

<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1">
<TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<TextArea fx:id="resultDisplay" editable="false" styleClass="result-display" />
</StackPane>

0 comments on commit 0c0d8f5

Please sign in to comment.