Skip to content

Commit

Permalink
Merge pull request #295 from yuanchengg/edit-ui-colour
Browse files Browse the repository at this point in the history 
Edit UI colour
  • Loading branch information
@yugan01
yugan01 authored Nov 7, 2024
2 parents a82a876 + 981be75 commit 0eeddd5
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 72 deletions.
Binary file modified docs/images/Ui.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/images/clinic_connect_system_32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 59 additions & 59 deletions src/main/resources/view/DarkTheme.css
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
.background {
-fx-background-color: derive(#1d1d1d, 20%);
background-color: #383838; /* Used in the default.html file */
-fx-background-color: derive(#95C6E5, 20%);
background-color: #7297B3; /* Used in the default.html file */
}

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

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

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

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

Expand All @@ -47,9 +47,9 @@
}

.table-view {
-fx-base: #1d1d1d;
-fx-control-inner-background: #1d1d1d;
-fx-background-color: #1d1d1d;
-fx-base: #95C6E5;
-fx-control-inner-background: #95C6E5;
-fx-background-color: #95C6E5;
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
Expand All @@ -71,7 +71,7 @@
.table-view .column-header .label {
-fx-font-size: 20pt;
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-text-fill: black;
-fx-alignment: center-left;
-fx-opacity: 1;
}
Expand All @@ -81,20 +81,20 @@
}

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

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

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

.list-cell {
Expand All @@ -104,15 +104,15 @@
}

.list-cell:filled:even {
-fx-background-color: #3c3e3f;
-fx-background-color: #95C6E5;
}

.list-cell:filled:odd {
-fx-background-color: #515658;
-fx-background-color: #D6FBFE;
}

.list-cell:filled:selected {
-fx-background-color: #424d5f;
-fx-background-color: #AEF1ED;
}

.list-cell:filled:selected #cardPane {
Expand All @@ -121,113 +121,113 @@
}

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

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

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

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

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

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

.result-display {
-fx-background-color: transparent;
-fx-font-family: "Segoe UI Light";
-fx-font-size: 13pt;
-fx-text-fill: white;
-fx-text-fill: black;
}

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

.patient-info-panel {
-fx-background-color: derive(#1d1d1d, 20%);
-fx-background-color: derive(#95C6E5, 20%);
}

.anchor-pane {
-fx-background-color: derive(#1d1d1d, 30%);
-fx-background-color: derive(#95C6E5, 30%);
}

.anchor-pane .label-subheader {
-fx-text-fill: white;
-fx-text-fill: black;
-fx-background-color: #00a5ab;
-fx-font-size: 15pt;
}

.label-text {
-fx-text-fill: white;
-fx-text-fill: black;
-fx-font-size: 11pt;
}

.status-bar .label {
-fx-font-family: "Segoe UI Light";
-fx-text-fill: white;
-fx-text-fill: black;
-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(#95C6E5, 30%);
-fx-border-color: derive(#95C6E5, 25%);
-fx-border-width: 1px;
}

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

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

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

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

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

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

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

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

/*
Expand All @@ -240,10 +240,10 @@
-fx-border-color: #e2e2e2;
-fx-border-width: 2;
-fx-background-radius: 0;
-fx-background-color: #1d1d1d;
-fx-background-color: #95C6E5;
-fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
-fx-font-size: 11pt;
-fx-text-fill: #d8d8d8;
-fx-text-fill: black;
-fx-background-insets: 0 0 0 0, 0, 1, 2;
}

Expand All @@ -254,7 +254,7 @@
.button:pressed,
.button:default:hover:pressed {
-fx-background-color: white;
-fx-text-fill: #1d1d1d;
-fx-text-fill: black;
}

.button:focused {
Expand All @@ -268,50 +268,50 @@
.button:disabled,
.button:default:disabled {
-fx-opacity: 0.4;
-fx-background-color: #1d1d1d;
-fx-text-fill: white;
-fx-background-color: #95C6E5;
-fx-text-fill: black;
}

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

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

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

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

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

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

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

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

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

Expand Down Expand Up @@ -347,14 +347,14 @@
}

#commandTextField {
-fx-background-color: transparent #383838 transparent #383838;
-fx-background-color: transparent #7297B3 transparent #7297B3;
-fx-background-insets: 0;
-fx-border-color: #383838 #383838 #ffffff #383838;
-fx-border-color: #7297B3 #7297B3 #ffffff #7297B3;
-fx-border-insets: 0;
-fx-border-width: 1;
-fx-font-family: "Segoe UI Light";
-fx-font-size: 13pt;
-fx-text-fill: white;
-fx-text-fill: black;
}

#filterField,
Expand All @@ -364,7 +364,7 @@
}

#resultDisplay .content {
-fx-background-color: transparent, #383838, transparent, #383838;
-fx-background-color: transparent, #95C6E5, transparent, #95C6E5;
-fx-background-radius: 0;
}

Expand All @@ -374,7 +374,7 @@
}

#healthServices .label {
-fx-text-fill: white;
-fx-text-fill: black;
-fx-background-color: #3e7b91;
-fx-padding: 1 3 1 3;
-fx-border-radius: 2;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/Extensions.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

.tag-selector {
Expand Down
Loading

0 comments on commit 0eeddd5

Please sign in to comment.