Merge pull request #3 from gateprotect/feature/mdomke/allow-font-path…

…-overwrite

Fix font-path variable declaration and change dir-structure

bower.json

@@ -0,0 +1,22 @@
+{
+ "name": "open-sans-fontface",
+ "version": "1.0.4",
+ "main": "./css/open-sans.css",
+ "homepage": "https://github.com/FontFaceKit/open-sans",
+ "authors": [
+ "Gustavo Henke <[email protected]>",
+ "Martin Domke <[email protected]>"
+ ],
+ "description": "The Open Sans fontface",
+ "keywords": [
+ "font"
+ ],
+ "license": "Apache License version 2.0",
+ "ignore": [
+ "**/.*",
+ "node_modules",
+ "bower_components",
+ "test",
+ "tests"
+ ]
+}

open-sans.css

@@ -3,11 +3,11 @@
 /* BEGIN Light */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/Light/OpenSans-Light.eot');
- src: url('font/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
- url('font/Light/OpenSans-Light.woff') format('woff'),
- url('font/Light/OpenSans-Light.ttf') format('truetype'),
- url('font/Light/OpenSans-Light.svg#OpenSansLight') format('svg');
+ src: url('fonts/Light/OpenSans-Light.eot');
+ src: url('fonts/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Light/OpenSans-Light.woff') format('woff'),
+ url('fonts/Light/OpenSans-Light.ttf') format('truetype'),
+ url('fonts/Light/OpenSans-Light.svg#OpenSansLight') format('svg');
  font-weight: 300;
  font-style: normal;
 }
@@ -16,11 +16,11 @@
 /* BEGIN Light Italic */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/LightItalic/OpenSans-LightItalic.eot');
- src: url('font/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),
- url('font/LightItalic/OpenSans-LightItalic.woff') format('woff'),
- url('font/LightItalic/OpenSans-LightItalic.ttf') format('truetype'),
- url('font/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg');
+ src: url('fonts/LightItalic/OpenSans-LightItalic.eot');
+ src: url('fonts/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),
+ url('fonts/LightItalic/OpenSans-LightItalic.woff') format('woff'),
+ url('fonts/LightItalic/OpenSans-LightItalic.ttf') format('truetype'),
+ url('fonts/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg');
  font-weight: 300;
  font-style: italic;
 }
@@ -29,11 +29,11 @@
 /* BEGIN Regular */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/Regular/OpenSans-Regular.eot');
- src: url('font/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
- url('font/Regular/OpenSans-Regular.woff') format('woff'),
- url('font/Regular/OpenSans-Regular.ttf') format('truetype'),
- url('font/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
+ src: url('fonts/Regular/OpenSans-Regular.eot');
+ src: url('fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Regular/OpenSans-Regular.woff') format('woff'),
+ url('fonts/Regular/OpenSans-Regular.ttf') format('truetype'),
+ url('fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@@ -42,11 +42,11 @@
 /* BEGIN Italic */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/Italic/OpenSans-Italic.eot');
- src: url('font/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
- url('font/Italic/OpenSans-Italic.woff') format('woff'),
- url('font/Italic/OpenSans-Italic.ttf') format('truetype'),
- url('font/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg');
+ src: url('fonts/Italic/OpenSans-Italic.eot');
+ src: url('fonts/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Italic/OpenSans-Italic.woff') format('woff'),
+ url('fonts/Italic/OpenSans-Italic.ttf') format('truetype'),
+ url('fonts/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg');
  font-weight: normal;
  font-style: italic;
 }
@@ -55,11 +55,11 @@
 /* BEGIN Semibold */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/Semibold/OpenSans-Semibold.eot');
- src: url('font/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
- url('font/Semibold/OpenSans-Semibold.woff') format('woff'),
- url('font/Semibold/OpenSans-Semibold.ttf') format('truetype'),
- url('font/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
+ src: url('fonts/Semibold/OpenSans-Semibold.eot');
+ src: url('fonts/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Semibold/OpenSans-Semibold.woff') format('woff'),
+ url('fonts/Semibold/OpenSans-Semibold.ttf') format('truetype'),
+ url('fonts/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
  font-weight: 600;
  font-style: normal;
 }
@@ -68,11 +68,11 @@
 /* BEGIN Semibold Italic */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/SemiboldItalic/OpenSans-SemiboldItalic.eot');
- src: url('font/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
- url('font/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'),
- url('font/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'),
- url('font/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg');
+ src: url('fonts/SemiboldItalic/OpenSans-SemiboldItalic.eot');
+ src: url('fonts/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
+ url('fonts/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'),
+ url('fonts/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'),
+ url('fonts/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg');
  font-weight: 600;
  font-style: italic;
 }
@@ -81,11 +81,11 @@
 /* BEGIN Bold */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/Bold/OpenSans-Bold.eot');
- src: url('font/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
- url('font/Bold/OpenSans-Bold.woff') format('woff'),
- url('font/Bold/OpenSans-Bold.ttf') format('truetype'),
- url('font/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg');
+ src: url('fonts/Bold/OpenSans-Bold.eot');
+ src: url('fonts/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Bold/OpenSans-Bold.woff') format('woff'),
+ url('fonts/Bold/OpenSans-Bold.ttf') format('truetype'),
+ url('fonts/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg');
  font-weight: bold;
  font-style: normal;
 }
@@ -94,11 +94,11 @@
 /* BEGIN Bold Italic */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/BoldItalic/OpenSans-BoldItalic.eot');
- src: url('font/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
- url('font/BoldItalic/OpenSans-BoldItalic.woff') format('woff'),
- url('font/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'),
- url('font/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg');
+ src: url('fonts/BoldItalic/OpenSans-BoldItalic.eot');
+ src: url('fonts/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('fonts/BoldItalic/OpenSans-BoldItalic.woff') format('woff'),
+ url('fonts/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'),
+ url('fonts/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg');
  font-weight: bold;
  font-style: italic;
 }
@@ -107,11 +107,11 @@
 /* BEGIN Extrabold */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/ExtraBold/OpenSans-ExtraBold.eot');
- src: url('font/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'),
- url('font/ExtraBold/OpenSans-ExtraBold.woff') format('woff'),
- url('font/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'),
- url('font/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg');
+ src: url('fonts/ExtraBold/OpenSans-ExtraBold.eot');
+ src: url('fonts/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'),
+ url('fonts/ExtraBold/OpenSans-ExtraBold.woff') format('woff'),
+ url('fonts/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'),
+ url('fonts/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg');
  font-weight: 800;
  font-style: normal;
 }
@@ -120,12 +120,12 @@
 /* BEGIN Extrabold Italic */
 @font-face {
  font-family: 'Open Sans';
- src: url('font/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot');
- src: url('font/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
- url('font/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'),
- url('font/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'),
- url('font/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg');
+ src: url('fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot');
+ src: url('fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'),
+ url('fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'),
+ url('fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg');
  font-weight: 800;
  font-style: italic;
 }
-/* END Extrabold Italic */
+/* END Extrabold Italic */

open-sans.less

@@ -1,6 +1,6 @@
 /* Open Sans @font-face kit */
 
-@OpenSansPath: "./font";
+@OpenSansPath: "./fonts";
 
 /* BEGIN Light */
 @font-face {
@@ -130,4 +130,4 @@
  font-weight: 800;
  font-style: italic;
 }
-/* END Extrabold Italic */
+/* END Extrabold Italic */

open-sans.scss

@@ -1,6 +1,6 @@
 /* Open Sans @font-face kit */
 
-$OpenSansPath: "./font";
+$OpenSansPath: "./fonts" !default;
 
 /* BEGIN Light */
 @font-face {