cartodb/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13 from CartoDB/fonts-location

Browse Source 
Moving generated styles to a ```css``` folder and changing all routes related with fonts due to this change
This commit is contained in:
Javier Álvarez Medina 2016-01-20 18:50:47 +01:00
commit e35f7ba3c2
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icon-font/template.jst.ejs
View File

@ -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;
}

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "cartoassets",
"description": "Share frontend assets between different CartoDB repositories",
"version": "0.1.13",
"version": "0.1.14",
"homepage": "https://github.com/cartodb/CartoAssets",
"author": {
"name": "xavijam",

BIN
src/fonts/cartoIcon.eot
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.ttf
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.woff
View File

Binary file not shown.

10
src/scss/icon-font.css.scss
View File

@ -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;
}

2
styleguide/_template.html
View File

@ -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}}

2
tasks/concat.js
View File

@ -2,7 +2,7 @@ module.exports = {
dist: {
options: {},
files: {
'dist/cartostyles.css': [
'dist/css/cartostyles.css': [
'.tmp/src/scss/**/*.css'
]
}

4
tasks/cssmin.js
View File

@ -4,8 +4,8 @@ module.exports = {
check: 'gzip'
},
files: {
'dist/cartostyles.css': [
'dist/cartostyles.css'
'dist/css/cartostyles.css': [
'dist/css/cartostyles.css'
]
}
}