Merge pull request #1 from beedaan/master

Fix bold font definition and file paths
skounis · Dec 19, 2015 · fc9d50f · fc9d50f
2 parents 2fd8e45 + 8789a14
commit fc9d50f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "montserrat-webfont",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/skounis/montserrat-webfont",
   "authors": [
     "Stavros Kounis <skounis@gmail.com>"

diff --git a/css/montserrat-webfont.css b/css/montserrat-webfont.css
@@ -1,18 +1,14 @@
-/* latin */
 @font-face {
   font-family: 'Montserrat';
+  src: url(../fonts/montserrat-bold-webfont.eot);
+  src: url(../fonts/montserrat-bold-webfont.eot?#iefix) format('embedded-opentype'), url(../fonts/montserrat-bold-webfont.woff2) format('woff2'), url(../fonts/montserrat-bold-webfont.woff) format('woff'), url(../fonts/montserrat-bold-webfont.ttf) format('truetype');
+  font-weight: 700;
   font-style: normal;
-  font-weight: 400;
-  src: url("../fonts/montserrat-regular-webfont.eot");
-  src: url("../fonts/montserrat-regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/montserrat-regular-webfont.woff2") format("woff2"), url("../fonts/montserrat-regular-webfont.woff") format("woff"), url("../fonts/montserrat-regular-webfont.ttf") format("truetype");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
 }
-/* latin */
 @font-face {
   font-family: 'Montserrat';
+  src: url(../fonts/montserrat-regular-webfont.eot);
+  src: url(../fonts/montserrat-regular-webfont.eot?#iefix) format('embedded-opentype'), url(../fonts/montserrat-regular-webfont.woff2) format('woff2'), url(../fonts/montserrat-regular-webfont.woff) format('woff'), url(../fonts/montserrat-regular-webfont.ttf) format('truetype');
+  font-weight: 400;
   font-style: normal;
-  font-weight: 700;
-  src: url("../montserrat-bold-webfont.eot");
-  src: url("../montserrat-bold-webfont.eot?#iefix") format("embedded-opentype"), url("../montserrat-bold-webfont.woff2") format("woff2"), url("../montserrat-bold-webfont.woff") format("woff"), url("../montserrat-bold-webfont.ttf") format("truetype");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
 }
diff --git a/css/montserrat-webfont.min.css b/css/montserrat-webfont.min.css
diff --git a/less/montserrat-webfont.less b/less/montserrat-webfont.less
@@ -1,3 +1,3 @@
 @import "_variables";
-@import "_playfair-bold";
-@import "_playfair-regular";
+@import "_montserrat-bold";
+@import "_montserrat-regular";
diff --git a/scss/montserrat-webfont.scss b/scss/montserrat-webfont.scss
@@ -1,3 +1,3 @@
 @import "_variables";
-@import "_playfair-bold";
-@import "_playfair-regular";
+@import "_montserrat-bold";
+@import "_montserrat-regular";