Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update landing screen GUI #110

Merged
merged 1 commit into from
Oct 11, 2020
Merged

Update landing screen GUI #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/resources/view/CommandBox.fxml
View file
Open in desktop
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/8" xmlns:fx="http://javafx.com/fxml/1">
<TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
<StackPane styleClass="command-stack-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Command"/>
</StackPane>

109 changes: 69 additions & 40 deletions src/main/resources/view/DarkTheme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
.background {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#121212, 100%);
background-color: #383838; /* Used in the default.html file */
}

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

.label-title {
-fx-font-size: 16pt;
-fx-font-family: "Segoe UI Semibold";
-fx-text-fill: #FFFFFF;
-fx-opacity: 1;
}

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

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

.text-field {
Expand All @@ -40,9 +47,9 @@
}

.table-view {
-fx-base: #1d1d1d;
-fx-control-inner-background: #1d1d1d;
-fx-background-color: #1d1d1d;
-fx-base: #121212;
-fx-control-inner-background: #121212;
-fx-background-color: #121212;
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
Expand All @@ -69,28 +76,28 @@
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-alignment: center-left;
-fx-opacity: 1;
-fx-opacity: 0.87;
}

.table-view:focused .table-row-cell:filled:focused:selected {
-fx-background-color: -fx-focus-color;
}

.split-pane:horizontal .split-pane-divider {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#121212, 10%);
-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(#121212, 10%);
}

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

.list-cell {
Expand All @@ -100,11 +107,17 @@
}

.list-cell:filled:even {
-fx-background-color: #3c3e3f;
-fx-background-color: #272C3F;
-fx-border-color: #FFEDDF;
-fx-border-width: 1;
-fx-border-style: hidden hidden solid hidden;
}

.list-cell:filled:odd {
-fx-background-color: #515658;
-fx-background-color: #272C3F;
-fx-border-color: #FFEDDF;
-fx-border-width: 1;
-fx-border-style: hidden hidden solid hidden;
}

.list-cell:filled:selected {
Expand All @@ -118,6 +131,7 @@

.list-cell .label {
-fx-text-fill: white;
-fx-opacity: 0.87;
}

.cell_big_label {
Expand All @@ -133,17 +147,28 @@
}

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

.command-stack-pane {
-fx-background-color: derive(#121212, 30%);
}

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

.rounded-pane-with-border {
-fx-border-radius: 10;
-fx-background-color: derive(#121212, 10%);
-fx-border-color: derive(#121212, 10%);
-fx-border-top-width: 1px;
}

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

.result-display {
Expand All @@ -155,52 +180,56 @@

.result-display .label {
-fx-text-fill: black !important;
-fx-opacity: 0.87;
}

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

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

.status-bar-with-border .label {
-fx-text-fill: white;
-fx-opacity: 0.87;
}

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

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

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

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

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

.menu-bar .label {
-fx-font-size: 14pt;
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-opacity: 0.9;
-fx-opacity: 0.87;
}

.menu .left-container {
Expand All @@ -217,7 +246,7 @@
-fx-border-color: #e2e2e2;
-fx-border-width: 2;
-fx-background-radius: 0;
-fx-background-color: #1d1d1d;
-fx-background-color: #121212;
-fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
-fx-font-size: 11pt;
-fx-text-fill: #d8d8d8;
Expand All @@ -230,7 +259,7 @@

.button:pressed, .button:default:hover:pressed {
-fx-background-color: white;
-fx-text-fill: #1d1d1d;
-fx-text-fill: #121212;
}

.button:focused {
Expand All @@ -243,7 +272,7 @@

.button:disabled, .button:default:disabled {
-fx-opacity: 0.4;
-fx-background-color: #1d1d1d;
-fx-background-color: #121212;
-fx-text-fill: white;
}

Expand All @@ -253,15 +282,15 @@
}

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

.dialog-pane {
-fx-background-color: #1d1d1d;
-fx-background-color: #121212;
}

.dialog-pane > *.button-bar > *.container {
-fx-background-color: #1d1d1d;
-fx-background-color: #121212;
}

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

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

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

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

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

Expand Down Expand Up @@ -349,18 +378,18 @@

#tags .label {
-fx-text-fill: white;
-fx-background-color: #3e7b91;
-fx-padding: 1 3 1 3;
-fx-background-color: #1976D2;
-fx-padding: 1 5 1 5;
-fx-border-radius: 2;
-fx-background-radius: 2;
-fx-background-radius: 50;
-fx-font-size: 11;
}

#participants .label {
-fx-text-fill: white;
-fx-background-color: #329568;
-fx-padding: 1 3 1 3;
-fx-padding: 1 5 1 5;
-fx-border-radius: 2;
-fx-background-radius: 2;
-fx-background-radius: 50;
-fx-font-size: 11;
}
22 changes: 19 additions & 3 deletions src/main/resources/view/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.stage.Stage?>

<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<fx:root minHeight="600" minWidth="550" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<icons>
<Image url="@/images/address_book_32.png" />
</icons>
Expand All @@ -40,14 +40,20 @@
</padding>
</StackPane>

<StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100" styleClass="pane-with-border" VBox.vgrow="NEVER">
<StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="80" prefHeight="80" styleClass="stack-pane" VBox.vgrow="NEVER">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
</StackPane>

<HBox styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<StackPane alignment="CENTER_LEFT" maxHeight="50" minHeight="50" prefHeight="50" styleClass="stack-pane" VBox.vgrow="NEVER">
<padding>
<Insets bottom="5" left="20" right="10" top="5" />
</padding>
<Label styleClass="label-title">ModDuke</Label>
</StackPane>

<HBox styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<VBox alignment="TOP_CENTER">
<Label>Contacts</Label>
<VBox fx:id="personList" minWidth="370" prefWidth="370" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
Expand All @@ -68,6 +74,16 @@
</VBox>
</VBox>

<VBox alignment="TOP_CENTER">
<Label alignment="CENTER">Meetings</Label>
<VBox fx:id="moduleList" minWidth="370" prefWidth="370" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<StackPane fx:id="moduleListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</VBox>
</VBox>

</HBox>

<StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/view/ResultDisplay.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>

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