straight port of _path.scss

docto · Jun 12, 2013 · fc72d63 · fc72d63
1 parent d737b2a
commit fc72d63
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 48 deletions.
diff --git a/css/font-awesome.css b/css/font-awesome.css
@@ -27,7 +27,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/FontAwesome.otf') format('opentype');
+  src: url('../font/fontawesome-webfont.eot?v=3.2.0');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
@@ -1,4 +1,4 @@
-@font-face{font-family:'FontAwesome';src:url('../font/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
+@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
 [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;cursor:default;speak:none;}
 .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
 a [class^="icon-"],a [class*=" icon-"]{display:inline;}

diff --git a/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot
diff --git a/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg
diff --git a/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf
diff --git a/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff
diff --git a/less/path.less b/less/path.less
@@ -3,13 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
-
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/scss/_path.scss b/scss/_path.scss
@@ -1,10 +1,14 @@
-// FONT PATH
+/* FONT PATH
+ * -------------------------- */
 
 @font-face {
-  font-family: "FontAwesome";
-  src: url("#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}");
-  src: url("#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}") format("embedded-opentype"), url("#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}") format("woff"), url("#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}") format("truetype"), url("#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}") format("svg");
-  //src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype') // used when developing fonts
+  font-family: 'FontAwesome';
+  src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}');
+  src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'),
+    url('${FontAwesomePath}/fontawesome-webfont.woff?v=${FontAwesomeVersion}') format('woff'),
+    url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'),
+    url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg');
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.eot b/src/assets/font-awesome/font/fontawesome-webfont.eot
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.svg b/src/assets/font-awesome/font/fontawesome-webfont.svg
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.ttf b/src/assets/font-awesome/font/fontawesome-webfont.ttf
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.woff b/src/assets/font-awesome/font/fontawesome-webfont.woff
diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less
@@ -3,13 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
-
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/assets/font-awesome/scss/_path.scss b/src/assets/font-awesome/scss/_path.scss
@@ -1,10 +1,14 @@
-// FONT PATH
+/* FONT PATH
+ * -------------------------- */
 
 @font-face {
-  font-family: "FontAwesome";
-  src: url("#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}");
-  src: url("#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}") format("embedded-opentype"), url("#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}") format("woff"), url("#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}") format("truetype"), url("#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}") format("svg");
-  //src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype') // used when developing fonts
+  font-family: 'FontAwesome';
+  src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}');
+  src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'),
+    url('${FontAwesomePath}/fontawesome-webfont.woff?v=${FontAwesomeVersion}') format('woff'),
+    url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'),
+    url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg');
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }