fontti päivitys

ArttuKuikka · Sep 24, 2024 · baa8f8a · baa8f8a
1 parent baf2217
commit baa8f8a
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml
@@ -30,7 +30,7 @@
 </head>
 <body style="background-color: #121212">
     <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light box-shadow mb-3" style="background-color: #1e1e1e; font-family:'Segoe UI';">
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light box-shadow mb-3" style="background-color: #1e1e1e; font-family:'Ruokalistafont', sans-serif;">
             <div class="container">
                 <a class="navbar-brand" style="color: #ffa500; font-weight: bold" href="/">Ruokalista</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"

diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml
@@ -4,7 +4,7 @@
 }
 
 
-<div class="text-center" style="font-family:'Segoe UI';">
+<div class="text-center" style="font-family:'Ruokalistafont', sans-serif;">
 
     @{
         if(ViewBag.RuokaOlemassa ?? false)

diff --git a/Views/Infotv/Index.cshtml b/Views/Infotv/Index.cshtml
@@ -160,7 +160,7 @@
 <body style="background-color: #2c2f33">
 	<img id="Background-image" class="infotv_bg" src="~/samplebg_infotv.jpg" />
 	<img class="template" src="~/infotv_template_bk.png" />
-	<div class="ruokacontainer" style=" text-align:center; color:white; font-family:'Segoe UI'">
+	<div class="ruokacontainer" style=" text-align:center; color:white; font-family:'Ruokalistafont'">
 
 		@{
 			if (ViewBag.RuokaOlemassa)

diff --git a/wwwroot/css/aanestys.css b/wwwroot/css/aanestys.css
@@ -40,14 +40,14 @@
 }
 
 .dayTitle {
-    font-family: Segoe UI;
+    font-family: Ruokalistafont;
     font-size: 1em;
     color: white;
     margin: 0px 0px 3px 5px;
 }
 
 .voteCountTitle {
-    font-family: Segoe UI;
+    font-family: Ruokalistafont;
     font-size: 0.8em;
     color: white;
     margin: -0.8em 0px -1px 5px;
@@ -91,39 +91,37 @@
 }
 
 .percentage-4 {
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     text-align: end;
     margin: 30px -0px 0px 0px;
     font-size: 1.2em;
-
 }
 
 .percentage-3 {
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     text-align: end;
     margin: 30px -0px 0px 0px;
     font-size: 1.2em;
 }
 
 .percentage-2 {
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     text-align: end;
     margin: 30px -0px 0px 0px;
     font-size: 1.2em;
 }
 
 .percentage-1 {
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     text-align: end;
     margin: 30px -0px 0px 0px;
     font-size: 1.2em;
 }
 
 .infotv-title {
     color: white;
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     font-weight: bold;
     font-size: 1.8em
-
 }
 
diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css
@@ -58,10 +58,12 @@ body {
     font-size: 1.9em
 }
 
+
+
 @font-face {
-    font-family: 'Segoe UI';
+    font-family: 'Ruokalistafont';
     font-style: normal;
     font-weight: normal;
-    src: local('Segoe UI Regular'), url('/fonts/SegoeUI.woff') format('woff');
+    src: local('Ruokalistafont'), url('/fonts/OpenSans-Regular-webfont.woff') format('woff');
 }
 
diff --git a/wwwroot/fonts/OpenSans-Regular-webfont.woff b/wwwroot/fonts/OpenSans-Regular-webfont.woff
diff --git a/wwwroot/fonts/Segoe UI Bold Italic.woff b/wwwroot/fonts/Segoe UI Bold Italic.woff
diff --git a/wwwroot/fonts/Segoe UI Bold.woff b/wwwroot/fonts/Segoe UI Bold.woff
diff --git a/wwwroot/fonts/Segoe UI Italic.woff b/wwwroot/fonts/Segoe UI Italic.woff
diff --git a/wwwroot/fonts/SegoeUI.woff b/wwwroot/fonts/SegoeUI.woff
diff --git a/wwwroot/js/aanestys.js b/wwwroot/js/aanestys.js
@@ -46,7 +46,7 @@ function CreateAanestysBox(data, body) {
         currentWeek = true;
     }
 
-    weekText.style.fontFamily = 'Segoe UI';
+    weekText.style.fontFamily = 'Ruokalistafont';
     weekText.style.color = 'white';
     weekText.style.fontSize = '2em';
     weekText.style.fontWeight = 'bold';
@@ -56,7 +56,7 @@ function CreateAanestysBox(data, body) {
     //yeartext
     var yearText = document.createElement('div');
     yearText.className = 'dayTitle';
-    yearText.style.fontFamily = 'Segoe UI';
+    yearText.style.fontFamily = 'Ruokalistafont';
     yearText.style.color = 'white';
     yearText.style.fontSize = '1.2em';
     yearText.style.fontWeight = 'bold';
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     }
-    <div class="text-center" style="font-family:'Segoe UI';">
+    <div class="text-center" style="font-family:'Ruokalistafont', sans-serif;">
         @{
             if(ViewBag.RuokaOlemassa ?? false)
@@ Expand Down @@