diff --git a/.gitignore b/.gitignore index caf96cb..2f47aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ npm-debug.log dist .grunt styleguide/index.html -icon_font/svgs diff --git a/Gulpfile.js b/Gulpfile.js index 6870ea9..760f2c4 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -3,18 +3,18 @@ var iconfont = require('gulp-iconfont'); var iconfontCss = require('gulp-iconfont-css'); gulp.task('default', function(){ - gulp.src(['./icon_font/svgs/*.svg']) + gulp.src(['./icon-font/svgs/*.svg']) .pipe(iconfontCss({ fontName: 'cartoIcon', - path: './icon_font/template.jst.ejs', + path: './icon-font/template.jst.ejs', targetPath: '../scss/icon-font.css.scss', fontPath: '../../fonts/' })) .pipe(iconfont({ fontName: 'cartoIcon', - appendCodepoints: true + appendCodepoints: true })) .pipe(gulp.dest('src/fonts/')); diff --git a/Icon-Fonting.md b/Icon-Fonting.md new file mode 100644 index 0000000..fae062b --- /dev/null +++ b/Icon-Fonting.md @@ -0,0 +1,34 @@ +How to make changes in the CartoDB icon font +-------------------------------------------- + +If you want to edit, add or remove any icon in our CartoDB font, you should follow these steps: + +- Check you have [Sketch](http://bohemiancoding.com/sketch/) last version. +- Open [font.sketch](http://github.com/CartoDB/CartoAssets/blob/master/icon-font/font.sketch) file and make your changes. + +### Rules for the icons: +- Size should have at max 500px of width/height. +- Place the icon accordingly with the grid. +- Icons should be completely black. +- Group the icon if it has several parts. +- Make icons exportable to SVG. +- Name your icon (layer/group) according to the pattern `icon-font_xx_Name`, where xx is a unique integer (increase it for each new icon). + +### When you're done with changes + +- Select all the icons, and export them to `app/assets/fonts/icon-font/svgs` folder (option should be visible in the bottom corner in your Sketch app): + -  + - Take into account that ```svgs``` folder is ignored. +- Open your terminal app and go to the CartoDB root folder. +- Install your node dependencies: `npm install` +- Now we will generate the new icon fonts + stylesheet. Just run: `./node_modules/.bin/gulp` +- Check that your `icon-font.css.scss` and the `cartoIcon` fonts have been edited: + -  + +All done! + + +### Troubleshooting + +- **Q**: "I ran `gulp` but the `icon-font.css.scss` file wasn't generated/updated!" + **A**: Make sure that the folder `icon-font/svgs` contain the `.svg` files. diff --git a/README.md b/README.md index c365c83..201bee6 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ It will generate a UI documentation about the components in this repository: If you want to check the documenation, it is generated in the ```dist``` folder. +### How to add/update the icon font + +See this [instructions](https://github.com/CartoDB/CartoAssets/blob/master/Icon-Fonting.md) + ### Publish a new version in NPM In order to publish a new version of CartoAssets you need to: @@ -32,31 +36,3 @@ Just run this command: - ```grunt publish``` -How to make changes in the CartoDB icon font --------------------------------------------- - -If you want to edit, add or remove any icon in our CartoDB font, you should follow these steps: - -- Check you have [Sketch](http://bohemiancoding.com/sketch/) last version. -- Open [font.sketch](http://github.com/CartoDB/CartoAssets/blob/master/icon_font/font.sketch) file and make your changes. - -### Rules for the icons: -- Size should have at max 500px of width/height. -- Place the icon accordingly with the grid. -- Icons should be completely black. -- Group the icon if it has several parts. -- Make icons exportable to SVG. -- Name your icon (layer/group) according to the pattern `icon-font_xx_Name`, where xx is a unique integer (increase it for each new icon). - -### When you're done with changes - -- Select all the icons, and export them to `app/assets/fonts/icon_font/svgs` folder (option should be visible in the bottom corner in your Sketch app): - -  - - Take into account that ```svgs``` folder is ignored. -- Open your terminal app and go to the CartoDB root folder. -- Install your node dependencies: `npm install` -- Now we will generate the new icon fonts + stylesheet. Just run: `./node_modules/.bin/gulp` -- Check that your `icon-font.css.scss` and the `cartoIcon` fonts have been edited: - -  - -All done! diff --git a/icon_font/font.sketch b/icon-font/font.sketch similarity index 100% rename from icon_font/font.sketch rename to icon-font/font.sketch diff --git a/icon-font/svgs/icon-font_01_Clock.svg b/icon-font/svgs/icon-font_01_Clock.svg new file mode 100644 index 0000000..b3e741b --- /dev/null +++ b/icon-font/svgs/icon-font_01_Clock.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_02_Stats.svg b/icon-font/svgs/icon-font_02_Stats.svg new file mode 100644 index 0000000..e5ad332 --- /dev/null +++ b/icon-font/svgs/icon-font_02_Stats.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_03_Heart--empty.svg b/icon-font/svgs/icon-font_03_Heart--empty.svg new file mode 100644 index 0000000..047bd79 --- /dev/null +++ b/icon-font/svgs/icon-font_03_Heart--empty.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_04_Heart--fill.svg b/icon-font/svgs/icon-font_04_Heart--fill.svg new file mode 100644 index 0000000..6fa773d --- /dev/null +++ b/icon-font/svgs/icon-font_04_Heart--fill.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_05_Alert.svg b/icon-font/svgs/icon-font_05_Alert.svg new file mode 100644 index 0000000..3adc3bf --- /dev/null +++ b/icon-font/svgs/icon-font_05_Alert.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_06_Rows.svg b/icon-font/svgs/icon-font_06_Rows.svg new file mode 100644 index 0000000..74e7b3b --- /dev/null +++ b/icon-font/svgs/icon-font_06_Rows.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_07_Check.svg b/icon-font/svgs/icon-font_07_Check.svg new file mode 100644 index 0000000..5435d68 --- /dev/null +++ b/icon-font/svgs/icon-font_07_Check.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_08_Dribbble.svg b/icon-font/svgs/icon-font_08_Dribbble.svg new file mode 100644 index 0000000..bbc33bf --- /dev/null +++ b/icon-font/svgs/icon-font_08_Dribbble.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_09_Twitter.svg b/icon-font/svgs/icon-font_09_Twitter.svg new file mode 100644 index 0000000..c89e41a --- /dev/null +++ b/icon-font/svgs/icon-font_09_Twitter.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_10_Wizard.svg b/icon-font/svgs/icon-font_10_Wizard.svg new file mode 100644 index 0000000..001fb05 --- /dev/null +++ b/icon-font/svgs/icon-font_10_Wizard.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_11_Info.svg b/icon-font/svgs/icon-font_11_Info.svg new file mode 100644 index 0000000..d8b7a08 --- /dev/null +++ b/icon-font/svgs/icon-font_11_Info.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_12_Fork.svg b/icon-font/svgs/icon-font_12_Fork.svg new file mode 100644 index 0000000..4b02f5b --- /dev/null +++ b/icon-font/svgs/icon-font_12_Fork.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_13_Facebook.svg b/icon-font/svgs/icon-font_13_Facebook.svg new file mode 100644 index 0000000..d4debe7 --- /dev/null +++ b/icon-font/svgs/icon-font_13_Facebook.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_14_Folder.svg b/icon-font/svgs/icon-font_14_Folder.svg new file mode 100644 index 0000000..7f66c56 --- /dev/null +++ b/icon-font/svgs/icon-font_14_Folder.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_15_Dropbox.svg b/icon-font/svgs/icon-font_15_Dropbox.svg new file mode 100644 index 0000000..69c2f92 --- /dev/null +++ b/icon-font/svgs/icon-font_15_Dropbox.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_16_Cloud.svg b/icon-font/svgs/icon-font_16_Cloud.svg new file mode 100644 index 0000000..aff4589 --- /dev/null +++ b/icon-font/svgs/icon-font_16_Cloud.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_17_Step.svg b/icon-font/svgs/icon-font_17_Step.svg new file mode 100644 index 0000000..46ccff7 --- /dev/null +++ b/icon-font/svgs/icon-font_17_Step.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_18_AddDocument.svg b/icon-font/svgs/icon-font_18_AddDocument.svg new file mode 100644 index 0000000..da1ca6e --- /dev/null +++ b/icon-font/svgs/icon-font_18_AddDocument.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_21_ArrowNext.svg b/icon-font/svgs/icon-font_21_ArrowNext.svg new file mode 100644 index 0000000..9be7423 --- /dev/null +++ b/icon-font/svgs/icon-font_21_ArrowNext.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_22_ArrowPrev.svg b/icon-font/svgs/icon-font_22_ArrowPrev.svg new file mode 100644 index 0000000..bdc04cb --- /dev/null +++ b/icon-font/svgs/icon-font_22_ArrowPrev.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_23_Close.svg b/icon-font/svgs/icon-font_23_Close.svg new file mode 100644 index 0000000..0d40187 --- /dev/null +++ b/icon-font/svgs/icon-font_23_Close.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_24_CartoFante.svg b/icon-font/svgs/icon-font_24_CartoFante.svg new file mode 100644 index 0000000..7bb3094 --- /dev/null +++ b/icon-font/svgs/icon-font_24_CartoFante.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_25_Lock.svg b/icon-font/svgs/icon-font_25_Lock.svg new file mode 100644 index 0000000..933f393 --- /dev/null +++ b/icon-font/svgs/icon-font_25_Lock.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_26_CartoDB.svg b/icon-font/svgs/icon-font_26_CartoDB.svg new file mode 100644 index 0000000..2536893 --- /dev/null +++ b/icon-font/svgs/icon-font_26_CartoDB.svg @@ -0,0 +1,22 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_27_Lens.svg b/icon-font/svgs/icon-font_27_Lens.svg new file mode 100644 index 0000000..7e904d2 --- /dev/null +++ b/icon-font/svgs/icon-font_27_Lens.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_28_CloseLimits.svg b/icon-font/svgs/icon-font_28_CloseLimits.svg new file mode 100644 index 0000000..a68a682 --- /dev/null +++ b/icon-font/svgs/icon-font_28_CloseLimits.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_29_DefaultUser.svg b/icon-font/svgs/icon-font_29_DefaultUser.svg new file mode 100644 index 0000000..7d2c9c7 --- /dev/null +++ b/icon-font/svgs/icon-font_29_DefaultUser.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_30_Cockroach.svg b/icon-font/svgs/icon-font_30_Cockroach.svg new file mode 100644 index 0000000..f7ae287 --- /dev/null +++ b/icon-font/svgs/icon-font_30_Cockroach.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_31_Floppy.svg b/icon-font/svgs/icon-font_31_Floppy.svg new file mode 100644 index 0000000..a246b40 --- /dev/null +++ b/icon-font/svgs/icon-font_31_Floppy.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_32_Trash.svg b/icon-font/svgs/icon-font_32_Trash.svg new file mode 100644 index 0000000..48340f6 --- /dev/null +++ b/icon-font/svgs/icon-font_32_Trash.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_33_Wifi.svg b/icon-font/svgs/icon-font_33_Wifi.svg new file mode 100644 index 0000000..7f894cf --- /dev/null +++ b/icon-font/svgs/icon-font_33_Wifi.svg @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_34_Unlock.svg b/icon-font/svgs/icon-font_34_Unlock.svg new file mode 100644 index 0000000..c10b8a7 --- /dev/null +++ b/icon-font/svgs/icon-font_34_Unlock.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg b/icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg new file mode 100644 index 0000000..9341f3c --- /dev/null +++ b/icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_36_Gift.svg b/icon-font/svgs/icon-font_36_Gift.svg new file mode 100644 index 0000000..c05647b --- /dev/null +++ b/icon-font/svgs/icon-font_36_Gift.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_37_People.svg b/icon-font/svgs/icon-font_37_People.svg new file mode 100644 index 0000000..39955db --- /dev/null +++ b/icon-font/svgs/icon-font_37_People.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_38_Play.svg b/icon-font/svgs/icon-font_38_Play.svg new file mode 100644 index 0000000..d68246f --- /dev/null +++ b/icon-font/svgs/icon-font_38_Play.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_39_Add.svg b/icon-font/svgs/icon-font_39_Add.svg new file mode 100644 index 0000000..f05f2fb --- /dev/null +++ b/icon-font/svgs/icon-font_39_Add.svg @@ -0,0 +1,27 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_40_Map.svg b/icon-font/svgs/icon-font_40_Map.svg new file mode 100644 index 0000000..937ab4e --- /dev/null +++ b/icon-font/svgs/icon-font_40_Map.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_41_Anchor.svg b/icon-font/svgs/icon-font_41_Anchor.svg new file mode 100644 index 0000000..7ec37fc --- /dev/null +++ b/icon-font/svgs/icon-font_41_Anchor.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_42_Key.svg b/icon-font/svgs/icon-font_42_Key.svg new file mode 100644 index 0000000..a6ffcd3 --- /dev/null +++ b/icon-font/svgs/icon-font_42_Key.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_43_Calendar.svg b/icon-font/svgs/icon-font_43_Calendar.svg new file mode 100644 index 0000000..c0f68f4 --- /dev/null +++ b/icon-font/svgs/icon-font_43_Calendar.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_44_Document.svg b/icon-font/svgs/icon-font_44_Document.svg new file mode 100644 index 0000000..8044e29 --- /dev/null +++ b/icon-font/svgs/icon-font_44_Document.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_45_Eye.svg b/icon-font/svgs/icon-font_45_Eye.svg new file mode 100644 index 0000000..a164f58 --- /dev/null +++ b/icon-font/svgs/icon-font_45_Eye.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_46_Marker.svg b/icon-font/svgs/icon-font_46_Marker.svg new file mode 100644 index 0000000..d3d4e8a --- /dev/null +++ b/icon-font/svgs/icon-font_46_Marker.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_47_ProgressBar.svg b/icon-font/svgs/icon-font_47_ProgressBar.svg new file mode 100644 index 0000000..d835596 --- /dev/null +++ b/icon-font/svgs/icon-font_47_ProgressBar.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_48_Book.svg b/icon-font/svgs/icon-font_48_Book.svg new file mode 100644 index 0000000..e37e587 --- /dev/null +++ b/icon-font/svgs/icon-font_48_Book.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_49_Notes.svg b/icon-font/svgs/icon-font_49_Notes.svg new file mode 100644 index 0000000..e2fe2f0 --- /dev/null +++ b/icon-font/svgs/icon-font_49_Notes.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_50_Rectangles.svg b/icon-font/svgs/icon-font_50_Rectangles.svg new file mode 100644 index 0000000..2b09a5b --- /dev/null +++ b/icon-font/svgs/icon-font_50_Rectangles.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_51_Mountain.svg b/icon-font/svgs/icon-font_51_Mountain.svg new file mode 100644 index 0000000..e58cb93 --- /dev/null +++ b/icon-font/svgs/icon-font_51_Mountain.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_52_Points.svg b/icon-font/svgs/icon-font_52_Points.svg new file mode 100644 index 0000000..91ce106 --- /dev/null +++ b/icon-font/svgs/icon-font_52_Points.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_53_Snake.svg b/icon-font/svgs/icon-font_53_Snake.svg new file mode 100644 index 0000000..54c7c19 --- /dev/null +++ b/icon-font/svgs/icon-font_53_Snake.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_54_Boss.svg b/icon-font/svgs/icon-font_54_Boss.svg new file mode 100644 index 0000000..a6bf9b3 --- /dev/null +++ b/icon-font/svgs/icon-font_54_Boss.svg @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_55_Rocket.svg b/icon-font/svgs/icon-font_55_Rocket.svg new file mode 100644 index 0000000..5d4abe6 --- /dev/null +++ b/icon-font/svgs/icon-font_55_Rocket.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_56_Barometer.svg b/icon-font/svgs/icon-font_56_Barometer.svg new file mode 100644 index 0000000..48d14d8 --- /dev/null +++ b/icon-font/svgs/icon-font_56_Barometer.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_57_Dollar.svg b/icon-font/svgs/icon-font_57_Dollar.svg new file mode 100644 index 0000000..c63544f --- /dev/null +++ b/icon-font/svgs/icon-font_57_Dollar.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_58_Email.svg b/icon-font/svgs/icon-font_58_Email.svg new file mode 100644 index 0000000..33bb782 --- /dev/null +++ b/icon-font/svgs/icon-font_58_Email.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_59_Label.svg b/icon-font/svgs/icon-font_59_Label.svg new file mode 100644 index 0000000..9200a4d --- /dev/null +++ b/icon-font/svgs/icon-font_59_Label.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_60_Outside.svg b/icon-font/svgs/icon-font_60_Outside.svg new file mode 100644 index 0000000..d41eeb6 --- /dev/null +++ b/icon-font/svgs/icon-font_60_Outside.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_61_Jigsaw.svg b/icon-font/svgs/icon-font_61_Jigsaw.svg new file mode 100644 index 0000000..10304ed --- /dev/null +++ b/icon-font/svgs/icon-font_61_Jigsaw.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_62_Tools.svg b/icon-font/svgs/icon-font_62_Tools.svg new file mode 100644 index 0000000..3025b12 --- /dev/null +++ b/icon-font/svgs/icon-font_62_Tools.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_63_Question.svg b/icon-font/svgs/icon-font_63_Question.svg new file mode 100644 index 0000000..3aa8500 --- /dev/null +++ b/icon-font/svgs/icon-font_63_Question.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_64_LayerStack.svg b/icon-font/svgs/icon-font_64_LayerStack.svg new file mode 100644 index 0000000..ac65fc1 --- /dev/null +++ b/icon-font/svgs/icon-font_64_LayerStack.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_65_Alarm.svg b/icon-font/svgs/icon-font_65_Alarm.svg new file mode 100644 index 0000000..2ac15d4 --- /dev/null +++ b/icon-font/svgs/icon-font_65_Alarm.svg @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_66_CloudDownArrow.svg b/icon-font/svgs/icon-font_66_CloudDownArrow.svg new file mode 100644 index 0000000..6318b87 --- /dev/null +++ b/icon-font/svgs/icon-font_66_CloudDownArrow.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_67_Pencil.svg b/icon-font/svgs/icon-font_67_Pencil.svg new file mode 100644 index 0000000..281770c --- /dev/null +++ b/icon-font/svgs/icon-font_67_Pencil.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_68_FountainPen.svg b/icon-font/svgs/icon-font_68_FountainPen.svg new file mode 100644 index 0000000..87eb2f7 --- /dev/null +++ b/icon-font/svgs/icon-font_68_FountainPen.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_69_EmptyDoc.svg b/icon-font/svgs/icon-font_69_EmptyDoc.svg new file mode 100644 index 0000000..0abc2c2 --- /dev/null +++ b/icon-font/svgs/icon-font_69_EmptyDoc.svg @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_70_MergeArrow.svg b/icon-font/svgs/icon-font_70_MergeArrow.svg new file mode 100644 index 0000000..8b35a9d --- /dev/null +++ b/icon-font/svgs/icon-font_70_MergeArrow.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_71_MergeColumns.svg b/icon-font/svgs/icon-font_71_MergeColumns.svg new file mode 100644 index 0000000..d5dd23d --- /dev/null +++ b/icon-font/svgs/icon-font_71_MergeColumns.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_72_MergeSpatial.svg b/icon-font/svgs/icon-font_72_MergeSpatial.svg new file mode 100644 index 0000000..55ba759 --- /dev/null +++ b/icon-font/svgs/icon-font_72_MergeSpatial.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_73_Globe.svg b/icon-font/svgs/icon-font_73_Globe.svg new file mode 100644 index 0000000..bbdb446 --- /dev/null +++ b/icon-font/svgs/icon-font_73_Globe.svg @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_74_ChevronDown.svg b/icon-font/svgs/icon-font_74_ChevronDown.svg new file mode 100644 index 0000000..8bb29fb --- /dev/null +++ b/icon-font/svgs/icon-font_74_ChevronDown.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_75_Streets.svg b/icon-font/svgs/icon-font_75_Streets.svg new file mode 100644 index 0000000..7cb315d --- /dev/null +++ b/icon-font/svgs/icon-font_75_Streets.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_76_Keys.svg b/icon-font/svgs/icon-font_76_Keys.svg new file mode 100644 index 0000000..064a035 --- /dev/null +++ b/icon-font/svgs/icon-font_76_Keys.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_77_FacebookSquare.svg b/icon-font/svgs/icon-font_77_FacebookSquare.svg new file mode 100644 index 0000000..093165f --- /dev/null +++ b/icon-font/svgs/icon-font_77_FacebookSquare.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_78_Fullscreen.svg b/icon-font/svgs/icon-font_78_Fullscreen.svg new file mode 100644 index 0000000..9726480 --- /dev/null +++ b/icon-font/svgs/icon-font_78_Fullscreen.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_79_Rarrow.svg b/icon-font/svgs/icon-font_79_Rarrow.svg new file mode 100644 index 0000000..b70ed44 --- /dev/null +++ b/icon-font/svgs/icon-font_79_Rarrow.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_80_Share.svg b/icon-font/svgs/icon-font_80_Share.svg new file mode 100644 index 0000000..6b67136 --- /dev/null +++ b/icon-font/svgs/icon-font_80_Share.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_81_Linkedin.svg b/icon-font/svgs/icon-font_81_Linkedin.svg new file mode 100644 index 0000000..3f60381 --- /dev/null +++ b/icon-font/svgs/icon-font_81_Linkedin.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_82_CalendarBlank.svg b/icon-font/svgs/icon-font_82_CalendarBlank.svg new file mode 100644 index 0000000..74083cf --- /dev/null +++ b/icon-font/svgs/icon-font_82_CalendarBlank.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_83_CreativeCommons.svg b/icon-font/svgs/icon-font_83_CreativeCommons.svg new file mode 100644 index 0000000..a7df97e --- /dev/null +++ b/icon-font/svgs/icon-font_83_CreativeCommons.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_84_Bubble.svg b/icon-font/svgs/icon-font_84_Bubble.svg new file mode 100644 index 0000000..9986899 --- /dev/null +++ b/icon-font/svgs/icon-font_84_Bubble.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_85_Bars.svg b/icon-font/svgs/icon-font_85_Bars.svg new file mode 100644 index 0000000..7c7aa8e --- /dev/null +++ b/icon-font/svgs/icon-font_85_Bars.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_86_ArrowMenu.svg b/icon-font/svgs/icon-font_86_ArrowMenu.svg new file mode 100644 index 0000000..b92b352 --- /dev/null +++ b/icon-font/svgs/icon-font_86_ArrowMenu.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_87_TieFighter.svg b/icon-font/svgs/icon-font_87_TieFighter.svg new file mode 100644 index 0000000..c10588f --- /dev/null +++ b/icon-font/svgs/icon-font_87_TieFighter.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_88_Ray.svg b/icon-font/svgs/icon-font_88_Ray.svg new file mode 100644 index 0000000..07b1601 --- /dev/null +++ b/icon-font/svgs/icon-font_88_Ray.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_89_Markup.svg b/icon-font/svgs/icon-font_89_Markup.svg new file mode 100644 index 0000000..a29fe80 --- /dev/null +++ b/icon-font/svgs/icon-font_89_Markup.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_90_Table.svg b/icon-font/svgs/icon-font_90_Table.svg new file mode 100644 index 0000000..2b98fc4 --- /dev/null +++ b/icon-font/svgs/icon-font_90_Table.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_91_Airlock.svg b/icon-font/svgs/icon-font_91_Airlock.svg new file mode 100644 index 0000000..59f2f68 --- /dev/null +++ b/icon-font/svgs/icon-font_91_Airlock.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_92_Pin.svg b/icon-font/svgs/icon-font_92_Pin.svg new file mode 100644 index 0000000..2748462 --- /dev/null +++ b/icon-font/svgs/icon-font_92_Pin.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_93_Attache.svg b/icon-font/svgs/icon-font_93_Attache.svg new file mode 100644 index 0000000..0866cb8 --- /dev/null +++ b/icon-font/svgs/icon-font_93_Attache.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_94_Download.svg b/icon-font/svgs/icon-font_94_Download.svg new file mode 100644 index 0000000..652d25f --- /dev/null +++ b/icon-font/svgs/icon-font_94_Download.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_95_Group.svg b/icon-font/svgs/icon-font_95_Group.svg new file mode 100644 index 0000000..915dd03 --- /dev/null +++ b/icon-font/svgs/icon-font_95_Group.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_96_Dashboard.svg b/icon-font/svgs/icon-font_96_Dashboard.svg new file mode 100644 index 0000000..d0600ac --- /dev/null +++ b/icon-font/svgs/icon-font_96_Dashboard.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_97_Spinner.svg b/icon-font/svgs/icon-font_97_Spinner.svg new file mode 100644 index 0000000..0859c7e --- /dev/null +++ b/icon-font/svgs/icon-font_97_Spinner.svg @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/icon_font/template.jst.ejs b/icon-font/template.jst.ejs similarity index 70% rename from icon_font/template.jst.ejs rename to icon-font/template.jst.ejs index 2f5cc75..eb570d3 100644 --- a/icon_font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -1,3 +1,6 @@ +// Icon font elements +// ---------------------------------------------- + @font-face { font-family: 'CartoIcon'; src: url('fonts/cartoIcon.eot'); @@ -19,12 +22,16 @@ line-height: 1; } -/* SG -# Icon font +/* SG +# Typography/Icon font +All available icons in CartoDB. + ``` <% _.each(glyphs, function(glyph) { %> -
Open Sans 26/34 Regular
@@ -11,7 +11,7 @@Open Sans 12/16 Semibold
Open Sans 10/14 Semibold
Open Sans 10/14 Regular
-``` +``` */ @import '../variables/sizes'; @@ -47,4 +47,3 @@ font-size: $sFontSize-small; line-height: $sLineHeight-small; } - diff --git a/src/scss/icon-font.css.scss b/src/scss/icon-font.css.scss index c1bc793..35e7c70 100644 --- a/src/scss/icon-font.css.scss +++ b/src/scss/icon-font.css.scss @@ -1,3 +1,6 @@ +// Icon font elements +// ---------------------------------------------- + @font-face { font-family: 'CartoIcon'; src: url('fonts/cartoIcon.eot'); @@ -19,285 +22,486 @@ line-height: 1; } -/* SG -# Icon font +/* SG +# Typography/Icon font +All available icons in CartoDB. + ``` -
Basics
+Important notes about this styleguide
+