diff options
| author | Geremia Taglialatela <tagliala.dev@gmail.com> | 2015-02-08 22:22:20 +0300 |
|---|---|---|
| committer | Dave Gandy <dave@davegandy.com> | 2015-07-29 00:52:04 +0300 |
| commit | b745845750a02cce808cd06a31722ab76fb713cc (patch) | |
| tree | 5a20a7a528f9636691b6cb27c393e064359bbfd0 | |
| parent | 1cbf5b575d77943e0272ade92e0d64bbf848f887 (diff) | |
Fix less version
Update gems
Improve makefile to use bundle
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 17 | ||||
| -rw-r--r-- | src/Makefile | 6 |
3 files changed, 18 insertions, 7 deletions
@@ -3,3 +3,5 @@ source 'https://rubygems.org' gem 'jekyll', '~> 1.0' gem 'safe_yaml', '~> 1.0.4' gem 'sass', '~> 3.0' +gem 'less', '~> 2.5.0' +gem 'therubyracer' diff --git a/Gemfile.lock b/Gemfile.lock index 82bb3d496..d84090d62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,8 +7,9 @@ GEM colorator (0.1) commander (4.1.6) highline (~> 1.6.11) + commonjs (0.2.7) fast-stemmer (1.0.2) - ffi (1.9.8) + ffi (1.9.6) highline (1.6.21) jekyll (1.5.1) classifier (~> 1.3) @@ -21,6 +22,9 @@ GEM redcarpet (~> 2.3.0) safe_yaml (~> 1.0) toml (~> 0.1.0) + less (2.5.1) + commonjs (~> 0.2.7) + libv8 (3.16.14.7) liquid (2.5.5) listen (1.3.1) rb-fsevent (>= 0.9.3) @@ -29,7 +33,7 @@ GEM maruku (0.7.0) parslet (1.5.0) blankslate (~> 2.0) - posix-spawn (0.3.10) + posix-spawn (0.3.9) pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) @@ -39,8 +43,12 @@ GEM rb-kqueue (0.2.3) ffi (>= 0.5.0) redcarpet (2.3.0) + ref (1.0.5) safe_yaml (1.0.4) - sass (3.4.13) + sass (3.4.11) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref toml (0.1.2) parslet (~> 1.5.0) yajl-ruby (1.1.0) @@ -50,5 +58,6 @@ PLATFORMS DEPENDENCIES jekyll (~> 1.0) - safe_yaml (~> 1.0.4) + less (~> 2.5.0) sass (~> 3.0) + therubyracer diff --git a/src/Makefile b/src/Makefile index 2058b20c6..bd98b53a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,11 +23,11 @@ build: @echo "Compiling Less files" @mkdir -p ${FA_CSS_DIRECTORY} - lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN} - lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN} + bundle exec lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN} + bundle exec lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN} # sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN} - lessc --yui-compress ${SITE_LESS} > ${SITE_CSS} + bundle exec lessc --yui-compress ${SITE_LESS} > ${SITE_CSS} cp -r ${FA_ROOT_DIRECTORY}/* ../ mv README.md-nobuild ../README.md cd assets && mv font-awesome font-awesome-{{ site.fontawesome.version }} && zip -r9 font-awesome-{{ site.fontawesome.version }}.zip font-awesome-{{ site.fontawesome.version }} && mv font-awesome-{{ site.fontawesome.version }} font-awesome |