From a61f8954a49fc3c3a2aca55f8e45ab8b2619abcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Mon, 2 Dec 2013 12:50:01 +0200 Subject: [PATCH] #41 Middleman, bootstrap-sass were updated. --- Gemfile | 18 +++++++++++++--- Gemfile.lock | 59 +++++++++++++++++++++++----------------------------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 1a5900a..20b63a7 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,17 @@ -source 'https://rubygems.org' +# If you have OpenSSL installed, we recommend updating +# the following line to use "https" +source 'http://rubygems.org' -gem 'middleman', '~> 3.1.4' +gem 'middleman', '~>3.2.0' + +# Live-reloading plugin gem 'middleman-livereload', '~> 3.1.0' -gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3' \ No newline at end of file + +# For faster file watcher updates on Windows: +gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] + +# Compass +gem 'compass', '~> 0.12.2' + +# Bootstrap sass +gem 'bootstrap-sass', '~> 3.0.2.1' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 84e9535..9871e28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,12 @@ -GIT - remote: git://github.com/thomas-mcdonald/bootstrap-sass.git - revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964 - branch: 3 - specs: - bootstrap-sass (3.0.0.0) - sass (~> 3.2) - GEM - remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: - activesupport (3.2.14) + activesupport (3.2.15) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - chunky_png (1.2.8) + bootstrap-sass (3.0.2.1) + sass (~> 3.2) + chunky_png (1.2.9) coffee-script (2.2.0) coffee-script-source execjs @@ -27,34 +21,33 @@ GEM eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) - ffi (1.9.0) + ffi (1.9.3) fssm (0.2.10) - haml (4.0.3) + haml (4.0.4) tilt hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.4) - kramdown (1.1.0) - listen (1.2.2) + i18n (0.6.5) + kramdown (1.2.0) + listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.1.4) + middleman (3.2.0) coffee-script (~> 2.2.0) compass (>= 0.12.2) execjs (~> 1.4.0) haml (>= 3.1.6) - kramdown (~> 1.1.0) - middleman-core (= 3.1.4) - middleman-more (= 3.1.4) + kramdown (~> 1.2) + middleman-core (= 3.2.0) middleman-sprockets (>= 3.1.2) sass (>= 3.1.20) uglifier (~> 2.1.0) - middleman-core (3.1.4) + middleman-core (3.2.0) activesupport (~> 3.2.6) bundler (~> 1.1) i18n (~> 0.6.1) - listen (~> 1.2.2) + listen (~> 1.1) rack (>= 1.4.5) rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) @@ -64,33 +57,31 @@ GEM middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-more (3.1.4) - middleman-sprockets (3.1.4) - middleman-core (>= 3.0.14) - middleman-more (>= 3.0.14) + middleman-sprockets (3.2.0) + middleman-core (~> 3.2) sprockets (~> 2.1) sprockets-helpers (~> 1.0.0) sprockets-sass (~> 1.0.0) - multi_json (1.7.8) + multi_json (1.8.2) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) rb-fsevent (0.9.3) - rb-inotify (0.9.0) + rb-inotify (0.9.2) ffi (>= 0.5.0) rb-kqueue (0.2.0) ffi (>= 0.5.0) - sass (3.2.9) - sprockets (2.10.0) + sass (3.2.12) + sprockets (2.10.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.0.1) sprockets (~> 2.0) - sprockets-sass (1.0.1) + sprockets-sass (1.0.2) sprockets (~> 2.0) tilt (~> 1.1) thor (0.18.1) @@ -103,6 +94,8 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass! - middleman (~> 3.1.4) + bootstrap-sass (~> 3.0.2.1) + compass (~> 0.12.2) + middleman (~> 3.2.0) middleman-livereload (~> 3.1.0) + wdm (~> 0.1.0)