FR-163 - replaced font

revenz · May 8, 2023 · ca6552b · ca6552b
1 parent 18702bd
commit ca6552b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/wwwroot/css/01_site.css b/wwwroot/css/01_site.css
diff --git a/wwwroot/css/01_site.scss b/wwwroot/css/01_site.scss
@@ -3,39 +3,43 @@
   color:var(--accent);
 }
 
+
+@font-face {
+    //font-family: "Source Sans Pro";
+    //src: url("/fonts/SourceSansPro-Regular.woff") format("woff");
+    font-family: "Montserrat";
+    src: url("/fonts/Montserrat-VariableFont_wght.ttf") format("truetype-variations");
+}
 html {
-    font-size: 14px;
-    font-family:sans-serif;
     position: relative;
     min-height: 100%;
-}
-
-@font-face {
-  font-family: "Source Sans Pro";
-  src: url("/fonts/SourceSansPro-Regular.woff") format("woff");
+    // font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"
+    font-family: "Montserrat", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    font-size:13px;
+    font-weight: 400;
 }
 body {
     /* variables */
-    --color-rgb: 240,240,240;
+    --color-rgb: 240, 240, 240;
     --color: rgb(var(--color-rgb));
     --color-darkest: rgb(160, 160, 160);
-    --color-secondary-rgb: 170,170,170;
+    --color-secondary-rgb: 170, 170, 170;
     --color-secondary: rgb(var(--color-secondary-rgb));
     --input-background-rgb: 49, 49, 49;
     --input-background: rgb(var(--input-background-rgb));
     --input-color: white;
-    --error-rgb: 255,100,100;
+    --error-rgb: 255, 100, 100;
     --error: rgb(var(--error-rgb));
-    
+
     --base: rgb(17, 18, 20);
     --base-rgb: 7, 18, 20;
     --base-darker: rgb(6, 17, 19);
     --base-darker-rgb: 6, 17, 19;
 
     --border-color: rgba(var(--color-rgb), 0.3);
     --input-border: var(---border-color);
-    --button-color:var(--color);
-    --button-background:transparent;
+    --button-color: var(--color);
+    --button-background: transparent;
 
     --success: #28a745;
     --success-rgb: 0, 167, 69;
@@ -45,8 +49,6 @@ body {
     --warning-rgb: 255, 193, 7;
     --danger: #dc3545;
     --danger-rgb: 220, 53, 69;
-
-    font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"
 }
 
 body {

diff --git a/wwwroot/css/fdrive/views/list.css b/wwwroot/css/fdrive/views/list.css
diff --git a/wwwroot/css/fdrive/views/list.scss b/wwwroot/css/fdrive/views/list.scss
@@ -20,7 +20,6 @@ $hoverBackground: rgba(var(--color-rgb), 0.2);
     overflow: hidden;
     display: flex;
     flex-direction: row;
-    font-size: 1.1rem;
     margin: var(--margin);
     height: calc(100% - (var(--margin) * 2));
     width: calc(100% - (var(--margin) * 4));

diff --git a/wwwroot/css/main-menu.css b/wwwroot/css/main-menu.css
diff --git a/wwwroot/css/main-menu.scss b/wwwroot/css/main-menu.scss
@@ -85,9 +85,9 @@
                     flex-direction: row;
                     align-items: center;
                     .label {
-                        width: 10rem;
-                        max-width: 10rem;
-                        min-width: 10rem;
+                        width: 12rem;
+                        max-width: 12rem;
+                        min-width: 12rem;
                         text-align: right;
                         margin-right:1rem;
                         margin-top: 0.25rem;

diff --git a/wwwroot/fonts/Montserrat-VariableFont_wght.ttf b/wwwroot/fonts/Montserrat-VariableFont_wght.ttf