other font for navbar

5 files changed, 25 insertions, 9 deletions

diff --git a/assets/css/style.css b/assets/css/style.css
index 2c19fa9..16d7f23 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -131,6 +131,27 @@ nav {
        url('/fonts/open-sans-v18-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 }
 
+/* merriweather-regular - latin */
+@font-face {
+  font-family: 'Merriweather';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Merriweather Regular'), local('Merriweather-Regular'),
+       url('/fonts/merriweather-v22-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/merriweather-v22-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* merriweather-700 - latin */
+@font-face {
+  font-family: 'Merriweather';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Merriweather Bold'), local('Merriweather-Bold'),
+       url('/fonts/merriweather-v22-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('/fonts/merriweather-v22-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+
 
 /* Structure */
 html {
@@ -594,7 +615,7 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 
 .menu__list {
 	list-style: none;
-	background: #2a2a2a;
+	background: {{ $highlightColor }};
 }
 
 .menu__item:hover {
@@ -606,16 +627,17 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 }
 
 .menu__item--active {
-	background: {{ $highlightColor }};
+	/* background: {{ $highlightColor }}; */
 }
 
 .menu__link {
 	display: block;
 	padding: 10px 15px;
 	padding: .625rem .9375rem;
+	font-family: 'Merriweather', Georgia, serif;
+	font-size: 18px;
 	font-weight: 700;
 	color: #fff;
-	text-transform: uppercase;
 }
 
 .menu__link:hover {
@@ -646,9 +668,6 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 }
 
 @media screen and (min-width: 767px) {
-	.menu {
-		border-bottom: 5px solid {{ $highlightColor }};
-	}
 
 	.menu__btn {
 		display: none;
@@ -667,9 +686,6 @@ button:not(:-moz-focusring):focus > .menu__btn-title {
 		transform: none;
 	}
 
-	.menu__item {
-		border-left: 1px solid rgba(255, 255, 255, .1);
-	}
 }
 
 /* Posts/Pages */
diff --git a/static/fonts/merriweather-v22-latin-700.woff b/static/fonts/merriweather-v22-latin-700.woff
new file mode 100644
index 0000000..afd6fec
--- /dev/null
+++ b/static/fonts/merriweather-v22-latin-700.woff
diff --git a/static/fonts/merriweather-v22-latin-700.woff2 b/static/fonts/merriweather-v22-latin-700.woff2
new file mode 100644
index 0000000..ead7c09
--- /dev/null
+++ b/static/fonts/merriweather-v22-latin-700.woff2
diff --git a/static/fonts/merriweather-v22-latin-regular.woff b/static/fonts/merriweather-v22-latin-regular.woff
new file mode 100644
index 0000000..2f2ab42
--- /dev/null
+++ b/static/fonts/merriweather-v22-latin-regular.woff
diff --git a/static/fonts/merriweather-v22-latin-regular.woff2 b/static/fonts/merriweather-v22-latin-regular.woff2
new file mode 100644
index 0000000..0998409
--- /dev/null
+++ b/static/fonts/merriweather-v22-latin-regular.woff2