Skip to content

Commit

Permalink
Merge pull request #208 from Chen-Kuei/branch_UI_CSS
Browse files Browse the repository at this point in the history
UI Enhancement
  • Loading branch information
Weiennn authored Nov 2, 2023
2 parents 208285e + 468f7a2 commit c17259e
Show file tree
Hide file tree
Showing 11 changed files with 404 additions and 45 deletions.
1 change: 1 addition & 0 deletions src/main/java/seedu/address/ui/ResultDisplay.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public ResultDisplay() {
public void setFeedbackToUser(String feedbackToUser) {
requireNonNull(feedbackToUser);
resultDisplay.setText(feedbackToUser);
resultDisplay.setWrapText(true);
}

}
Binary file added src/main/resources/images/department.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/images/email.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/images/phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/images/role.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/images/salary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 1 addition & 8 deletions src/main/resources/view/Extensions.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@

.list-cell:empty {
/* Empty cells will not have alternating colours */
-fx-background: #383838;
}

.tag-selector {
-fx-border-width: 1;
-fx-border-color: white;
-fx-border-radius: 3;
-fx-background-radius: 3;
-fx-background: #FFFFFF;
}

.tooltip-text {
Expand Down
345 changes: 345 additions & 0 deletions src/main/resources/view/LightTheme.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,345 @@
.background {
-fx-background-color: derive(white, 20%);
background-color: white; /* Used in the default.html file */
}

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

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

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

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

.tab-pane {
-fx-padding: 0 0 0 1;
}

.tab-pane .tab-header-area {
-fx-padding: 0 0 0 0;
-fx-min-height: 0;
-fx-max-height: 0;
}

.table-view {
-fx-base: white;
-fx-control-inner-background: white;
-fx-background-color: white;
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
}

.table-view .column-header-background {
-fx-background-color: transparent;
}

.table-view .column-header, .table-view .filler {
-fx-size: 35;
-fx-border-width: 0 0 1 0;
-fx-background-color: transparent;
-fx-border-color:
transparent
transparent
derive(-fx-base, 80%)
transparent;
-fx-border-insets: 0 10 1 0;
}

.table-view .column-header .label {
-fx-font-size: 20pt;
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-alignment: center-left;
-fx-opacity: 1;
}

.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(white, 20%);
-fx-border-color: transparent transparent transparent #4d4d4d;
}

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

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

.list-cell {
-fx-label-padding: 0 0 0 0;
-fx-graphic-text-gap : 0;
-fx-padding: 0 0 0 0;
}

.list-cell:filled:even {
-fx-background-color: #c5d4eb;
-fx-background-radius: 5;
-fx-border-color: #007aa2;
-fx-border-radius: 5;
}

.list-cell:filled:odd {
-fx-background-color: #c5d4eb;
-fx-background-radius: 5;
-fx-border-color: #007aa2;
-fx-border-radius: 5;
}

.list-cell:filled:selected {
-fx-background-color: #44cef6;
-fx-background-radius: 5;
}

.cell_big_label {
-fx-font-family: "Segoe UI Semibold";
-fx-font-size: 18px;
-fx-text-fill: white;
}

.cell_small_label {
-fx-font-family: "Segoe UI";
-fx-font-size: 15px;
-fx-text-fill: black;
}

.stack-pane {
-fx-background-color: derive(white, 20%);
-fx-background-radius: 5;
-fx-commandTextField-color: black;
}

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

.status-bar {
-fx-background-color: derive(white, 30%);
}

.result-display {
-fx-background-color: transparent;
-fx-font-family: "Segoe UI Light";
-fx-font-size: 12pt;
-fx-text-fill: black;
-fx-border-color: #007aa2;
-fx-border-radius: 5;
}

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

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

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

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

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

.grid-pane .stack-pane {
-fx-background-color: derive(white, 30%);
}

.context-menu {
-fx-background-color: derive(white, 50%);
}

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

.menu-bar {
-fx-background-color: derive(white, 20%);
}

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

.menu .left-container {
-fx-background-color: black;
}

/*
* Metro style Push Button
* Author: Pedro Duque Vieira
* http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
*/
.button {
-fx-padding: 5 22 5 22;
-fx-border-color: #e2e2e2;
-fx-border-width: 2;
-fx-background-radius: 0;
-fx-background-color: #ff0000;
-fx-font-family: "Segoe UI", Helvetica, Arial, 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;
}

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

.button:focused {
-fx-border-color: white, white;
-fx-border-width: 1, 1;
-fx-border-style: solid, segments(1, 1);
-fx-border-radius: 0, 0;
-fx-border-insets: 1 1 1 1, 0;
}

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

.button:default {
-fx-background-color: -fx-focus-color;
-fx-text-fill: #ffffff;
}

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

.dialog-pane {
-fx-background-color: white;
}

.dialog-pane > *.button-bar > *.container {
-fx-background-color: white;
}

.dialog-pane > *.label.content {
-fx-font-size: 14px;
-fx-font-weight: bold;
-fx-text-fill: white;
}

.dialog-pane:header *.header-panel {
-fx-background-color: derive(white, 25%);
}

.dialog-pane:header *.header-panel *.label {
-fx-font-size: 18px;
-fx-font-style: italic;
-fx-fill: white;
-fx-text-fill: white;
}

.scroll-bar {
-fx-background-color: derive(white, 20%);
-fx-border-color: #95b9c7;
-fx-border-radius: 5;
}

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

.scroll-bar .increment-button, .scroll-bar .decrement-button {
-fx-background-color: transparent;
-fx-padding: 0 0 0 0;
}

.scroll-bar .increment-arrow, .scroll-bar .decrement-arrow {
-fx-shape: " ";
}

.scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .decrement-arrow {
-fx-padding: 1 8 1 8;
}

.scroll-bar:horizontal .increment-arrow, .scroll-bar:horizontal .decrement-arrow {
-fx-padding: 0 0 0 0;
}

#cardPane {
-fx-background-color: transparent;
-fx-border-width: 0;
}

#commandTypeLabel {
-fx-font-size: 12px;
-fx-text-fill: #ff0000;
}

#commandTextField {
-fx-background-color: white;
-fx-background-insets: 0;
-fx-background-radius: 5;
-fx-border-color: #007aa2;
-fx-border-insets: 0;
-fx-border-width: 1;
-fx-border-radius: 5;
-fx-font-family: "Segoe UI Light";
-fx-font-size: 12pt;
-fx-text-fill: black;
}

#filterField, #personListPanel, #personWebpage {
-fx-effect: innershadow(gaussian, black, 10, 0, 0, 0);
}

#resultDisplay .content {
-fx-background-color: white;
-fx-background-radius: 5;
}

Loading

0 comments on commit c17259e

Please sign in to comment.