Browse Source

Switch to Open Sans font

Change-Id: I3a3f1f2dc1315eaa151033a1daee38bb31d7eb37
changes/85/566185/2
James E. Blair 1 year ago
parent
commit
3eaaf68524

+ 14
- 7
www/assets/css/main.css View File

@@ -1,5 +1,14 @@
1 1
 @import url("font-awesome.min.css");
2
-@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,600,600italic");
2
+@font-face {
3
+  font-family: 'Open Sans';
4
+  src: url("../fonts/OpenSans-Regular-webfont.woff") format("woff");
5
+  font-weight: normal;
6
+  font-style: normal; }
7
+@font-face {
8
+  font-family: 'Open Sans';
9
+  src: url("../fonts/OpenSans-Bold-webfont.woff") format("woff");
10
+  font-weight: bold;
11
+  font-style: bold; }
3 12
 /*
4 13
 	Arcana by HTML5 UP
5 14
 	html5up.net | @ajlkn
@@ -1388,9 +1397,9 @@ body {
1388 1397
 
1389 1398
 body, input, select, textarea {
1390 1399
   color: #474747;
1391
-  font-family: 'Source Sans Pro', sans-serif;
1400
+  font-family: 'Open Sans', sans-serif;
1392 1401
   font-size: 16pt;
1393
-  font-weight: 300;
1402
+  font-weight: 400;
1394 1403
   line-height: 1.65em; }
1395 1404
 
1396 1405
 a {
@@ -1428,7 +1437,7 @@ h1, h2, h3, h4, h5, h6 {
1428 1437
     text-decoration: none; }
1429 1438
   h1 em, h2 em, h3 em, h4 em, h5 em, h6 em {
1430 1439
     font-style: normal;
1431
-    font-weight: 300; }
1440
+    font-weight: 400; }
1432 1441
 
1433 1442
 h2 {
1434 1443
   font-size: 1.75em;
@@ -1817,7 +1826,6 @@ input[type="button"],
1817 1826
       #nav > ul > li a {
1818 1827
         color: #071d49;
1819 1828
         text-decoration: none;
1820
-        font-weight: 600;
1821 1829
         border: 0;
1822 1830
         display: block;
1823 1831
         padding: 2em 0.5em 0.5em 0.5em; }
@@ -1856,7 +1864,6 @@ input[type="button"],
1856 1864
     .dropotron > li > a {
1857 1865
       color: #071d49;
1858 1866
       text-decoration: none;
1859
-      font-weight: 600;
1860 1867
       border: 0; }
1861 1868
     .dropotron > li.active > a, .dropotron > li:hover > a {
1862 1869
       color: #41b6e6; }
@@ -2125,7 +2132,7 @@ input[type="button"],
2125 2132
       z-index: 1; }
2126 2133
       #titleBar .title em {
2127 2134
         font-style: normal;
2128
-        font-weight: 300; }
2135
+        font-weight: 400; }
2129 2136
     #titleBar .toggle {
2130 2137
       text-decoration: none;
2131 2138
       border: 0;

BIN
www/assets/fonts/OpenSans-Bold-webfont.woff View File


BIN
www/assets/fonts/OpenSans-Regular-webfont.woff View File


+ 13
- 0
www/assets/sass/libs/_fonts.scss View File

@@ -0,0 +1,13 @@
1
+@font-face {
2
+    font-family: 'Open Sans';
3
+    src: url('../fonts/OpenSans-Regular-webfont.woff') format('woff');
4
+    font-weight: normal;
5
+    font-style: normal;
6
+}
7
+
8
+@font-face {
9
+    font-family: 'Open Sans';
10
+    src: url('../fonts/OpenSans-Bold-webfont.woff') format('woff');
11
+    font-weight: bold;
12
+    font-style: bold;
13
+}

+ 5
- 7
www/assets/sass/main.scss View File

@@ -1,8 +1,8 @@
1 1
 @import 'libs/vars';
2 2
 @import 'libs/functions';
3 3
 @import 'libs/mixins';
4
+@import 'libs/fonts';
4 5
 @import url("font-awesome.min.css");
5
-@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,600,600italic");
6 6
 
7 7
 /*
8 8
 	Arcana by HTML5 UP
@@ -73,9 +73,9 @@
73 73
 
74 74
 	body, input, select, textarea {
75 75
 		color: _palette(fg);
76
-		font-family: 'Source Sans Pro', sans-serif;
76
+		font-family: 'Open Sans', sans-serif;
77 77
 		font-size: 16pt;
78
-		font-weight: 300;
78
+		font-weight: 400;
79 79
 		line-height: 1.65em;
80 80
 	}
81 81
 
@@ -121,7 +121,7 @@
121 121
 
122 122
 		em {
123 123
 			font-style: normal;
124
-			font-weight: 300;
124
+			font-weight: 400;
125 125
 		}
126 126
 	}
127 127
 
@@ -630,7 +630,6 @@
630 630
 				a {
631 631
 					color: _palette(dark-blue);
632 632
 					text-decoration: none;
633
-					font-weight: 600;
634 633
 					border: 0;
635 634
 					display: block;
636 635
 					padding: 2em 0.5em 0.5em 0.5em;
@@ -694,7 +693,6 @@
694 693
 			> a {
695 694
 				color: _palette(dark-blue);
696 695
 				text-decoration: none;
697
-				font-weight: 600;
698 696
 				border: 0;
699 697
 			}
700 698
 
@@ -1109,7 +1107,7 @@
1109 1107
 
1110 1108
 					em {
1111 1109
 						font-style: normal;
1112
-						font-weight: 300;
1110
+						font-weight: 400;
1113 1111
 					}
1114 1112
 				}
1115 1113
 

Loading…
Cancel
Save