summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2018-05-03 16:06:24 -0700
committerJames E. Blair <jeblair@redhat.com>2018-05-09 12:41:04 -0700
commit3eaaf685247eadce7f338a3d8362fc1a3e696a1c (patch)
tree221d1d45f9bb67356bf4a4ef02b7d64aa2f95170
parent24ecafeb9fbf85f3886cce7b7059ad208d720bd5 (diff)
Switch to Open Sans font
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 10 May 2018 16:01:25 +0000 Reviewed-on: https://review.openstack.org/566185 Project: openstack-infra/zuul-website Branch: refs/heads/master
-rw-r--r--www/assets/css/main.css21
-rw-r--r--www/assets/fonts/OpenSans-Bold-webfont.woffbin0 -> 20676 bytes
-rw-r--r--www/assets/fonts/OpenSans-Regular-webfont.woffbin0 -> 20696 bytes
-rw-r--r--www/assets/sass/libs/_fonts.scss13
-rw-r--r--www/assets/sass/main.scss12
5 files changed, 32 insertions, 14 deletions
diff --git a/www/assets/css/main.css b/www/assets/css/main.css
index 1d492ff..96e9638 100644
--- a/www/assets/css/main.css
+++ b/www/assets/css/main.css
@@ -1,5 +1,14 @@
1@import url("font-awesome.min.css"); 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 Arcana by HTML5 UP 13 Arcana by HTML5 UP
5 html5up.net | @ajlkn 14 html5up.net | @ajlkn
@@ -1388,9 +1397,9 @@ body {
1388 1397
1389body, input, select, textarea { 1398body, input, select, textarea {
1390 color: #474747; 1399 color: #474747;
1391 font-family: 'Source Sans Pro', sans-serif; 1400 font-family: 'Open Sans', sans-serif;
1392 font-size: 16pt; 1401 font-size: 16pt;
1393 font-weight: 300; 1402 font-weight: 400;
1394 line-height: 1.65em; } 1403 line-height: 1.65em; }
1395 1404
1396a { 1405a {
@@ -1428,7 +1437,7 @@ h1, h2, h3, h4, h5, h6 {
1428 text-decoration: none; } 1437 text-decoration: none; }
1429 h1 em, h2 em, h3 em, h4 em, h5 em, h6 em { 1438 h1 em, h2 em, h3 em, h4 em, h5 em, h6 em {
1430 font-style: normal; 1439 font-style: normal;
1431 font-weight: 300; } 1440 font-weight: 400; }
1432 1441
1433h2 { 1442h2 {
1434 font-size: 1.75em; 1443 font-size: 1.75em;
@@ -1817,7 +1826,6 @@ input[type="button"],
1817 #nav > ul > li a { 1826 #nav > ul > li a {
1818 color: #071d49; 1827 color: #071d49;
1819 text-decoration: none; 1828 text-decoration: none;
1820 font-weight: 600;
1821 border: 0; 1829 border: 0;
1822 display: block; 1830 display: block;
1823 padding: 2em 0.5em 0.5em 0.5em; } 1831 padding: 2em 0.5em 0.5em 0.5em; }
@@ -1856,7 +1864,6 @@ input[type="button"],
1856 .dropotron > li > a { 1864 .dropotron > li > a {
1857 color: #071d49; 1865 color: #071d49;
1858 text-decoration: none; 1866 text-decoration: none;
1859 font-weight: 600;
1860 border: 0; } 1867 border: 0; }
1861 .dropotron > li.active > a, .dropotron > li:hover > a { 1868 .dropotron > li.active > a, .dropotron > li:hover > a {
1862 color: #41b6e6; } 1869 color: #41b6e6; }
@@ -2125,7 +2132,7 @@ input[type="button"],
2125 z-index: 1; } 2132 z-index: 1; }
2126 #titleBar .title em { 2133 #titleBar .title em {
2127 font-style: normal; 2134 font-style: normal;
2128 font-weight: 300; } 2135 font-weight: 400; }
2129 #titleBar .toggle { 2136 #titleBar .toggle {
2130 text-decoration: none; 2137 text-decoration: none;
2131 border: 0; 2138 border: 0;
diff --git a/www/assets/fonts/OpenSans-Bold-webfont.woff b/www/assets/fonts/OpenSans-Bold-webfont.woff
new file mode 100644
index 0000000..0415e8b
--- /dev/null
+++ b/www/assets/fonts/OpenSans-Bold-webfont.woff
Binary files differ
diff --git a/www/assets/fonts/OpenSans-Regular-webfont.woff b/www/assets/fonts/OpenSans-Regular-webfont.woff
new file mode 100644
index 0000000..e1153e3
--- /dev/null
+++ b/www/assets/fonts/OpenSans-Regular-webfont.woff
Binary files differ
diff --git a/www/assets/sass/libs/_fonts.scss b/www/assets/sass/libs/_fonts.scss
new file mode 100644
index 0000000..67d2095
--- /dev/null
+++ b/www/assets/sass/libs/_fonts.scss
@@ -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}
diff --git a/www/assets/sass/main.scss b/www/assets/sass/main.scss
index 10d6c81..1489684 100644
--- a/www/assets/sass/main.scss
+++ b/www/assets/sass/main.scss
@@ -1,8 +1,8 @@
1@import 'libs/vars'; 1@import 'libs/vars';
2@import 'libs/functions'; 2@import 'libs/functions';
3@import 'libs/mixins'; 3@import 'libs/mixins';
4@import 'libs/fonts';
4@import url("font-awesome.min.css"); 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 Arcana by HTML5 UP 8 Arcana by HTML5 UP
@@ -73,9 +73,9 @@
73 73
74 body, input, select, textarea { 74 body, input, select, textarea {
75 color: _palette(fg); 75 color: _palette(fg);
76 font-family: 'Source Sans Pro', sans-serif; 76 font-family: 'Open Sans', sans-serif;
77 font-size: 16pt; 77 font-size: 16pt;
78 font-weight: 300; 78 font-weight: 400;
79 line-height: 1.65em; 79 line-height: 1.65em;
80 } 80 }
81 81
@@ -121,7 +121,7 @@
121 121
122 em { 122 em {
123 font-style: normal; 123 font-style: normal;
124 font-weight: 300; 124 font-weight: 400;
125 } 125 }
126 } 126 }
127 127
@@ -630,7 +630,6 @@
630 a { 630 a {
631 color: _palette(dark-blue); 631 color: _palette(dark-blue);
632 text-decoration: none; 632 text-decoration: none;
633 font-weight: 600;
634 border: 0; 633 border: 0;
635 display: block; 634 display: block;
636 padding: 2em 0.5em 0.5em 0.5em; 635 padding: 2em 0.5em 0.5em 0.5em;
@@ -694,7 +693,6 @@
694 > a { 693 > a {
695 color: _palette(dark-blue); 694 color: _palette(dark-blue);
696 text-decoration: none; 695 text-decoration: none;
697 font-weight: 600;
698 border: 0; 696 border: 0;
699 } 697 }
700 698
@@ -1109,7 +1107,7 @@
1109 1107
1110 em { 1108 em {
1111 font-style: normal; 1109 font-style: normal;
1112 font-weight: 300; 1110 font-weight: 400;
1113 } 1111 }
1114 } 1112 }
1115 1113