Merge pull request #99 from primer/font_file_variable

Adding the path variable to the scss file
primer · Jun 16, 2016 · ba3023a · ba3023a
2 parents 87da3f7 + fb7de5a
commit ba3023a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### HEAD
+
+Fixes:
+
+- Putting the `$octicons-font-path` back in the scss file.
+
 ### 4.1.0 (June 6, 2016)
 
 Adds:

diff --git a/build/font/_octicons.scss b/build/font/_octicons.scss
@@ -1,14 +1,16 @@
+$octicons-font-path: "./" !default;
+
 
 @font-face {
-	font-family:"Octicons";
-	src:url("octicons.eot?89624517212bc6232de6d7b6c801ca91");
-	src:url("octicons.eot?#iefix") format("embedded-opentype"),
-		url("octicons.woff2?89624517212bc6232de6d7b6c801ca91") format("woff2"),
-		url("octicons.woff?89624517212bc6232de6d7b6c801ca91") format("woff"),
-		url("octicons.ttf?89624517212bc6232de6d7b6c801ca91") format("truetype"),
-		url("octicons.svg?89624517212bc6232de6d7b6c801ca91#octicons") format("svg");
-	font-weight:normal;
-	font-style:normal;
+  font-family:"Octicons";
+  src:url("#{$octicons-font-path}octicons.eot?c0c33aeb9e311df3a64b40895eb56c03");
+  src:url("#{$octicons-font-path}octicons.eot?#iefix") format("embedded-opentype"),
+		url("#{$octicons-font-path}octicons.woff2?c0c33aeb9e311df3a64b40895eb56c03") format("woff2"),
+		url("#{$octicons-font-path}octicons.woff?c0c33aeb9e311df3a64b40895eb56c03") format("woff"),
+		url("#{$octicons-font-path}octicons.ttf?c0c33aeb9e311df3a64b40895eb56c03") format("truetype"),
+		url("#{$octicons-font-path}octicons.svg?c0c33aeb9e311df3a64b40895eb56c03#octicons") format("svg");
+  font-weight:normal;
+  font-style:normal;
 }
 
 
@@ -28,6 +30,7 @@
   -webkit-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  speak: none;
 }
 .mega-octicon { font-size: 32px; }
 

diff --git a/build/font/octicons.css b/build/font/octicons.css
@@ -1,14 +1,14 @@
 
 @font-face {
-	font-family:"Octicons";
-	src:url("octicons.eot?e8b041c217b3d809c380606d0320205a");
-	src:url("octicons.eot?#iefix") format("embedded-opentype"),
-		url("octicons.woff2?e8b041c217b3d809c380606d0320205a") format("woff2"),
-		url("octicons.woff?e8b041c217b3d809c380606d0320205a") format("woff"),
-		url("octicons.ttf?e8b041c217b3d809c380606d0320205a") format("truetype"),
-		url("octicons.svg?e8b041c217b3d809c380606d0320205a#octicons") format("svg");
-	font-weight:normal;
-	font-style:normal;
+  font-family:"Octicons";
+  src:url("octicons.eot?5e5746b1afa34d378ebe1091967df505");
+  src:url("octicons.eot?#iefix") format("embedded-opentype"),
+		url("octicons.woff2?5e5746b1afa34d378ebe1091967df505") format("woff2"),
+		url("octicons.woff?5e5746b1afa34d378ebe1091967df505") format("woff"),
+		url("octicons.ttf?5e5746b1afa34d378ebe1091967df505") format("truetype"),
+		url("octicons.svg?5e5746b1afa34d378ebe1091967df505#octicons") format("svg");
+  font-weight:normal;
+  font-style:normal;
 }
 
 
@@ -28,6 +28,7 @@
   -webkit-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  speak: none;
 }
 .mega-octicon { font-size: 32px; }
 

diff --git a/build/font/octicons.eot b/build/font/octicons.eot
diff --git a/build/font/octicons.min.css b/build/font/octicons.min.css
diff --git a/build/font/octicons.svg b/build/font/octicons.svg
diff --git a/build/font/octicons.ttf b/build/font/octicons.ttf
diff --git a/build/font/octicons.woff b/build/font/octicons.woff
diff --git a/build/font/octicons.woff2 b/build/font/octicons.woff2
diff --git a/lib/font/template.css b/lib/font/template.css
@@ -1,17 +1,17 @@
 <% if (fontfaceStyles) { %>
 <% if (fontSrc1 && embed.length) { %>
 @font-face {
-	font-family:"<%= fontFamilyName %>";
-	src:<%= fontSrc1 %>;
-	font-weight:normal;
-	font-style:normal;
+  font-family:"<%= fontFamilyName %>";
+  src:<%= fontSrc1 %>;
+  font-weight:normal;
+  font-style:normal;
 }
 <% } %>@font-face {
-	font-family:"<%= fontFamilyName %>";<% if (fontSrc1) { %>
-	src:<%= fontSrc1 %>;<% }%>
-	src:<%= fontSrc2 %>;
-	font-weight:normal;
-	font-style:normal;
+  font-family:"<%= fontFamilyName %>";<% if (fontSrc1) { %>
+  src:<%= fontSrc1 %>;<% }%>
+  src:<%= fontSrc2 %>;
+  font-weight:normal;
+  font-style:normal;
 }
 <% } %>
 
@@ -32,7 +32,7 @@
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-	speak: none;
+  speak: none;
 }
 .mega-octicon { font-size: 32px; }
 <% if (iconsStyles) { for (var glyphIdx = 0; glyphIdx < glyphs.length; glyphIdx++) { %>

diff --git a/lib/font/template.scss b/lib/font/template.scss
@@ -1,17 +1,19 @@
+$octicons-font-path: "./" !default;
+
 <% if (fontfaceStyles) { %>
 <% if (fontSrc1 && embed.length) { %>
 @font-face {
-	font-family:"<%= fontFamilyName %>";
-	src:<%= fontSrc1 %>;
-	font-weight:normal;
-	font-style:normal;
+  font-family:"<%= fontFamilyName %>";
+  src:<%= fontSrc1.replace(/url\("/gi, "url(\"#{$octicons-font-path}") %>;
+  font-weight:normal;
+  font-style:normal;
 }
 <% } %>@font-face {
-	font-family:"<%= fontFamilyName %>";<% if (fontSrc1) { %>
-	src:<%= fontSrc1 %>;<% }%>
-	src:<%= fontSrc2 %>;
-	font-weight:normal;
-	font-style:normal;
+  font-family:"<%= fontFamilyName %>";<% if (fontSrc1) { %>
+  src:<%= fontSrc1.replace(/url\("/gi, "url(\"#{$octicons-font-path}") %>;<% }%>
+  src:<%= fontSrc2.replace(/url\("/gi, "url(\"#{$octicons-font-path}") %>;
+  font-weight:normal;
+  font-style:normal;
 }
 <% } %>
 
@@ -32,7 +34,7 @@
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-	speak: none;
+  speak: none;
 }
 .mega-octicon { font-size: 32px; }
 <% if (iconsStyles) { for (var glyphIdx = 0; glyphIdx < glyphs.length; glyphIdx++) { %>