Merge pull request #200 from mycolorway/fonticons

update font icons

.gitignore

@@ -24,3 +24,4 @@ _site
 package
 .ackrc
 Gemfile.lock
+tmp/

Gruntfile.coffee

@@ -95,11 +95,6 @@ module.exports = (grunt) ->
         files: [{
           src: 'styles/simditor.css',
           dest: 'site/assets/styles/simditor.css'
-        }, {
-          expand: true,
-          flatten: true,
-          src: 'fonts/*',
-          dest: 'site/assets/fonts/'
         }]
       scripts:
         files: [{
@@ -138,11 +133,6 @@ module.exports = (grunt) ->
           flatten: true
           src: 'styles/*',
           dest: 'package/styles/'
-        }, {
-          expand: true,
-          flatten: true
-          src: 'fonts/*',
-          dest: 'package/fonts/'
         }, {
           src: 'site/assets/images/image.png',
           dest: 'package/images/image.png'
@@ -233,6 +223,11 @@ module.exports = (grunt) ->
             'vendor/bower/simple-hotkeys/lib/hotkeys.js'
           ]
 
+    curl:
+      fonticons:
+        src: "http://use.fonticons.com/kits/d7611efe/d7611efe.css"
+        dest: "styles/fonticon.scss"
+
 
   grunt.loadNpmTasks 'grunt-contrib-sass'
   grunt.loadNpmTasks 'grunt-contrib-coffee'
@@ -246,8 +241,11 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-jekyll'
   grunt.loadNpmTasks 'grunt-contrib-jasmine'
   grunt.loadNpmTasks 'grunt-banner'
+  grunt.loadNpmTasks 'grunt-curl'
 
   grunt.registerTask 'default', ['site', 'express', 'jasmine:test:build', 'watch']
   grunt.registerTask 'site', ['sass', 'coffee', 'umd', 'copy:vendor', 'copy:scripts', 'copy:styles', 'usebanner', 'jekyll']
   grunt.registerTask 'test', ['sass', 'coffee', 'umd', 'jasmine']
   grunt.registerTask 'package', ['clean:package', 'copy:package', 'uglify:simditor', 'compress']
+
+  grunt.registerTask 'fonticons', ['curl']

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "homepage": "http://simditor.tower.im/",
   "authors": [
     "farthinker <[email protected]>"

lib/simditor.js

@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.1.4
+* Simditor v2.1.5
 * http://simditor.tower.im/
-* 2015-06-03
+* 2015-07-03
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -3084,7 +3084,7 @@ ColorButton = (function(superClass) {
 
   ColorButton.prototype.name = 'color';
 
-  ColorButton.prototype.icon = 'font';
+  ColorButton.prototype.icon = 'tint';
 
   ColorButton.prototype.disableTag = 'pre';
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "A simple online editor",
   "keywords": "editor simditor",
   "repository": {
@@ -19,9 +19,9 @@
   "homepage": "http://simditor.tower.im",
   "dependencies": {
     "jquery": "2.x",
-    "simplemodule": "2.x",
+    "simple-hotkeys": "1.x",
     "simple-uploader": "2.x",
-    "simple-hotkeys": "1.x"
+    "simplemodule": "2.x"
   },
   "devDependencies": {
     "grunt": "0.x",
@@ -37,6 +37,7 @@
     "grunt-umd": "2.3.x",
     "grunt-express": "1.4.0",
     "grunt-banner": "0.3.x",
+    "grunt-curl": "2.1.x",
     "express": "~3.3.4"
   }
 }

site/assets/scripts/simditor.js

@@ -3079,7 +3079,7 @@ ColorButton = (function(superClass) {
 
   ColorButton.prototype.name = 'color';
 
-  ColorButton.prototype.icon = 'font';
+  ColorButton.prototype.icon = 'tint';
 
   ColorButton.prototype.disableTag = 'pre';