Revert "Fix font issue on M1 Mac Big Sur (AY2122S2-CS2103T-T12-4#106)" (

AY2122S2-CS2103T-T12-4#119) This reverts commit 9a46153, which was aimed at sidestepping se-edu/addressbook-level3#105. A better solution has been identified which made the current fix redundant while introducing path issues that are not obvious, see se-edu/addressbook-level3#111 for more details.
brian16600 · Jan 13, 2022 · 8d5b66e · 8d5b66e
1 parent ed01361
commit 8d5b66e
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 261 deletions.
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
diff --git a/src/main/resources/fonts/open-sans/LICENSE.txt b/src/main/resources/fonts/open-sans/LICENSE.txt
diff --git a/src/main/resources/fonts/open-sans/OpenSans-Bold.ttf b/src/main/resources/fonts/open-sans/OpenSans-Bold.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-BoldItalic.ttf b/src/main/resources/fonts/open-sans/OpenSans-BoldItalic.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-ExtraBold.ttf b/src/main/resources/fonts/open-sans/OpenSans-ExtraBold.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-ExtraBoldItalic.ttf b/src/main/resources/fonts/open-sans/OpenSans-ExtraBoldItalic.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-Italic.ttf b/src/main/resources/fonts/open-sans/OpenSans-Italic.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-Light.ttf b/src/main/resources/fonts/open-sans/OpenSans-Light.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-LightItalic.ttf b/src/main/resources/fonts/open-sans/OpenSans-LightItalic.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-Regular.ttf b/src/main/resources/fonts/open-sans/OpenSans-Regular.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-SemiBold.ttf b/src/main/resources/fonts/open-sans/OpenSans-SemiBold.ttf
diff --git a/src/main/resources/fonts/open-sans/OpenSans-SemiBoldItalic.ttf b/src/main/resources/fonts/open-sans/OpenSans-SemiBoldItalic.ttf
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -5,28 +5,28 @@
 
 .label {
     -fx-font-size: 11pt;
-    -fx-font-family: "Open Sans Semibold";
+    -fx-font-family: "Segoe UI Semibold";
     -fx-text-fill: #555555;
     -fx-opacity: 0.9;
 }
 
 .label-bright {
     -fx-font-size: 11pt;
-    -fx-font-family: "Open Sans Semibold";
+    -fx-font-family: "Segoe UI Semibold";
     -fx-text-fill: white;
     -fx-opacity: 1;
 }
 
 .label-header {
     -fx-font-size: 32pt;
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-text-fill: white;
     -fx-opacity: 1;
 }
 
 .text-field {
     -fx-font-size: 12pt;
-    -fx-font-family: "Open Sans Semibold";
+    -fx-font-family: "Segoe UI Semibold";
 }
 
 .tab-pane {
@@ -66,7 +66,7 @@
 
 .table-view .column-header .label {
     -fx-font-size: 20pt;
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-text-fill: white;
     -fx-alignment: center-left;
     -fx-opacity: 1;
@@ -121,13 +121,13 @@
 }
 
 .cell_big_label {
-    -fx-font-family: "Open Sans Semibold";
+    -fx-font-family: "Segoe UI Semibold";
     -fx-font-size: 16px;
     -fx-text-fill: #010504;
 }
 
 .cell_small_label {
-    -fx-font-family: "Open Sans Regular";
+    -fx-font-family: "Segoe UI";
     -fx-font-size: 13px;
     -fx-text-fill: #010504;
 }
@@ -148,7 +148,7 @@
 
 .result-display {
     -fx-background-color: transparent;
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-font-size: 13pt;
     -fx-text-fill: white;
 }
@@ -158,7 +158,7 @@
 }
 
 .status-bar .label {
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-text-fill: white;
     -fx-padding: 4px;
     -fx-pref-height: 30px;
@@ -198,7 +198,7 @@
 
 .menu-bar .label {
     -fx-font-size: 14pt;
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-text-fill: white;
     -fx-opacity: 0.9;
 }
@@ -218,7 +218,7 @@
     -fx-border-width: 2;
     -fx-background-radius: 0;
     -fx-background-color: #1d1d1d;
-    -fx-font-family: "Open Sans Regular";
+    -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;
@@ -323,7 +323,7 @@
     -fx-border-color: #383838 #383838 #ffffff #383838;
     -fx-border-insets: 0;
     -fx-border-width: 1;
-    -fx-font-family: "Open Sans Light";
+    -fx-font-family: "Segoe UI Light";
     -fx-font-size: 13pt;
     -fx-text-fill: white;
 }

diff --git a/src/main/resources/view/Fonts.css b/src/main/resources/view/Fonts.css
diff --git a/src/main/resources/view/HelpWindow.css b/src/main/resources/view/HelpWindow.css
@@ -1,5 +1,4 @@
 #copyButton, #helpMessage {
-    -fx-font-family: "Open Sans";
     -fx-text-fill: white;
 }
 

diff --git a/src/main/resources/view/HelpWindow.fxml b/src/main/resources/view/HelpWindow.fxml
@@ -16,7 +16,6 @@
   <scene>
     <Scene>
       <stylesheets>
-        <URL value="@Fonts.css" />
         <URL value="@HelpWindow.css" />
       </stylesheets>
 

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -19,7 +19,6 @@
   <scene>
     <Scene>
       <stylesheets>
-        <URL value="@Fonts.css"/>
         <URL value="@DarkTheme.css" />
         <URL value="@Extensions.css" />
       </stylesheets>