0.1.1: bugfix, fix workflow, update dist files

airpub · Sep 19, 2014 · 76bb1b7 · 76bb1b7
1 parent 595954a
commit 76bb1b7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ psd
 thumb
 *.log
 bower_*
-dist/codemirror.*
+dist/codemirror.*
+dist/font.css
diff --git a/.npmignore b/.npmignore
@@ -7,4 +7,5 @@ thumb
 bower_*
 dist/codemirror.*
 screenshot.png
-editor-ninja.jpg
+editor-ninja.jpg
+dist/font.css
diff --git a/bin/build-css-core.sh b/bin/build-css-core.sh
@@ -2,6 +2,7 @@
 
 # compile core style of ninja editor
 node_modules/.bin/concat \
+  dist/font.css \
   dist/codemirror.min.css \
   dist/ninja.css \
   -o dist/ninja.min.css
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ninja",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "homepage": "https://github.com/airpub/ninja",
   "authors": [
     "Guo Yu <[email protected]>"

diff --git a/dist/ninja.min.css b/dist/ninja.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "editor-ninja",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "the missing front-end markdown editor for Airpub and everyone else",
   "main": "dist.ninja.min.js",
   "scripts": {
@@ -11,6 +11,7 @@
     "build-css": "npm run build-css-core && npm run build-css-bundle",
     "build-less": "node_modules/.bin/lessc -x src/less/ninja.less dist/ninja.css",
     "watch-less": "node_modules/.bin/rewatch src/**/*.less -c 'npm run build-less'",
+    "build-font": "node_modules/.bin/lessc -x src/less/font.less dist/font.css",
     "build": "npm run build-js && npm run build-css",
     "serve": "node_modules/.bin/serve --no-less .",
     "dev": "npm run serve & npm run watch-less"

diff --git a/src/less/font.less b/src/less/font.less
@@ -0,0 +1 @@
+@import url("../../fontawesome/css/font-awesome.min.css");
diff --git a/src/less/ninja.less b/src/less/ninja.less
@@ -1,5 +1,3 @@
-@import url("../../fontawesome/css/font-awesome.min.css");
-
 @import 'scrollbar.less';
 @import 'editor.less';
 @import 'zen.less';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import url("../../fontawesome/css/font-awesome.min.css");