separate octicons.scss from sprockets-octicons.scss

primer · Jun 2, 2015 · b027d2d · b027d2d · cameronmcefee · Jun 2, 2015
1 parent b24ada2
commit b027d2d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/octicons/octicons-local.ttf b/octicons/octicons-local.ttf
diff --git a/octicons/octicons.eot b/octicons/octicons.eot
diff --git a/octicons/octicons.less b/octicons/octicons.less
@@ -1,5 +1,5 @@
 @octicons-font-path: ".";
-@octicons-version:   "d06ce002ddd442d23cd70c22b9373bd4d73fa109";
+@octicons-version:   "932555081d58ad24701c658c97328237bbc156d2";
 
 @font-face {
   font-family: 'octicons';

diff --git a/octicons/octicons.ttf b/octicons/octicons.ttf
diff --git a/octicons/octicons.woff b/octicons/octicons.woff
diff --git a/octicons/sprockets-octicons.scss b/octicons/sprockets-octicons.scss
@@ -1,12 +1,9 @@
-$octicons-font-path: "." !default;
-$octicons-version:   "d06ce002ddd442d23cd70c22b9373bd4d73fa109";
-
 @font-face {
   font-family: 'octicons';
-  src: url('#{$octicons-font-path}/octicons.eot?#iefix&v=#{$octicons-version}') format('embedded-opentype'),
-       url('#{$octicons-font-path}/octicons.woff?v=#{$octicons-version}') format('woff'),
-       url('#{$octicons-font-path}/octicons.ttf?v=#{$octicons-version}') format('truetype'),
-       url('#{$octicons-font-path}/octicons.svg?v=#{$octicons-version}#octicons') format('svg');
+  src: font-url('octicons.eot?#iefix') format('embedded-opentype'),
+       font-url('octicons.woff') format('woff'),
+       font-url('octicons.ttf') format('truetype'),
+       font-url('octicons.svg#octicons') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "octicons",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "GitHub's icon font",
   "main": "README.md",
   "repository": {