Moving generated css to a css folder and changing all routes related with fonts due to this change

9 years ago · 78ebf3d9a9
parent a613fa900a
commit 78ebf3d9a9
8 changed files with 14 additions and 14 deletions
--- a/icon-font/template.jst.ejs
+++ b/icon-font/template.jst.ejs
@ -3,11 +3,11 @@

@font-face {
  font-family: 'CartoIcon';
-  src: url('fonts/cartoIcon.eot');
-  src: url('fonts/cartoIcon.eot?#iefix') format('embedded-opentype'),
-  url('fonts/cartoIcon.woff') format('woff'),
-  url('fonts/cartoIcon.ttf') format('truetype'),
-  url('fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg');
+  src: url('../fonts/cartoIcon.eot');
+  src: url('../fonts/cartoIcon.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/cartoIcon.woff') format('woff'),
+  url('../fonts/cartoIcon.ttf') format('truetype'),
+  url('../fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg');
  font-weight: normal;
  font-style: normal;
 }
--- a/src/fonts/cartoIcon.eot
+++ b/src/fonts/cartoIcon.eot
--- a/src/fonts/cartoIcon.ttf
+++ b/src/fonts/cartoIcon.ttf
--- a/src/fonts/cartoIcon.woff
+++ b/src/fonts/cartoIcon.woff
--- a/src/scss/icon-font.css.scss
+++ b/src/scss/icon-font.css.scss
@ -3,11 +3,11 @@

@font-face {
  font-family: 'CartoIcon';
-  src: url('fonts/cartoIcon.eot');
-  src: url('fonts/cartoIcon.eot?#iefix') format('embedded-opentype'),
-  url('fonts/cartoIcon.woff') format('woff'),
-  url('fonts/cartoIcon.ttf') format('truetype'),
-  url('fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg');
+  src: url('../fonts/cartoIcon.eot');
+  src: url('../fonts/cartoIcon.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/cartoIcon.woff') format('woff'),
+  url('../fonts/cartoIcon.ttf') format('truetype'),
+  url('../fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg');
  font-weight: normal;
  font-style: normal;
 }
--- a/styleguide/_template.html
+++ b/styleguide/_template.html
@ -1,5 +1,5 @@
 <head>
-  <link href='../cartostyles.css' type='text/css' rel='stylesheet'>
+  <link href='../css/cartostyles.css' type='text/css' rel='stylesheet'>
 </head>

 {{> theme}}
--- a/tasks/concat.js
+++ b/tasks/concat.js
@ -2,7 +2,7 @@ module.exports = {
  dist: {
    options: {},
    files: {
-      'dist/cartostyles.css': [
+      'dist/css/cartostyles.css': [
        '.tmp/src/scss/**/*.css'
      ]
    }
--- a/tasks/cssmin.js
+++ b/tasks/cssmin.js
@ -4,8 +4,8 @@ module.exports = {
      check: 'gzip'
    },
    files: {
-      'dist/cartostyles.css': [
-        'dist/cartostyles.css'
+      'dist/css/cartostyles.css': [
+        'dist/css/cartostyles.css'
      ]
    }
  }