diff --git a/Gemfile b/Gemfile index b13373a..45b7b98 100755 --- a/Gemfile +++ b/Gemfile @@ -2,16 +2,16 @@ # the following line to use "https" source 'http://rubygems.org' -gem 'middleman', '~>3.3.3' +gem 'middleman', '~>3.3.7' # Live-reloading plugin -gem 'middleman-livereload', '~> 3.1.0' +gem 'middleman-livereload', '~> 3.4.2' # Middleman-sprockets -gem 'middleman-sprockets', '3.3.2' +gem 'middleman-sprockets', '3.4.1' # Middleman-deploy -gem 'middleman-deploy', '~> 0.2.4' +gem 'middleman-deploy', '~> 1.0.0' # For faster file watcher updates on Windows: gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] @@ -20,7 +20,7 @@ gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] gem 'tzinfo-data', platforms: [:mswin, :mingw] # Compass -gem 'compass', '~> 0.12.6' +gem 'compass', '~> 1.0.3' # Twitter Bootstrap -gem 'bootstrap-sass', '~> 3.1.1.1' \ No newline at end of file +gem 'bootstrap-sass', '~> 3.3.3' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 32017c9..1f470c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,123 +1,133 @@ GEM remote: http://rubygems.org/ specs: - activesupport (4.1.1) + activesupport (4.1.9) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - bootstrap-sass (3.1.1.1) - sass (~> 3.2) - chunky_png (1.3.1) - coffee-script (2.2.0) + autoprefixer-rails (5.0.0.1) + execjs + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) + celluloid (0.16.0) + timers (~> 4.0.0) + chunky_png (1.3.3) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) - compass (0.12.6) + coffee-script-source (1.8.0) + compass (1.0.3) chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.2.19) - compass-import-once (1.0.4) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) sass (>= 3.2, < 3.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.3) - execjs (2.1.0) - ffi (1.9.3) - fssm (0.2.10) - haml (4.0.5) + eventmachine (1.0.4) + execjs (2.2.2) + ffi (1.9.6) + haml (4.0.6) tilt hike (1.2.3) + hitimes (1.2.2) hooks (0.4.0) uber (~> 0.0.4) http_parser.rb (0.6.0) - i18n (0.6.9) - json (1.8.1) - kramdown (1.3.3) - listen (1.3.1) + i18n (0.6.11) + json (1.8.2) + kramdown (1.5.0) + listen (2.8.5) + celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - middleman (3.3.3) - coffee-script (~> 2.2.0) - compass (>= 0.12.4) - compass-import-once (= 1.0.4) + middleman (3.3.7) + coffee-script (~> 2.2) + compass (>= 1.0.0, < 2.0.0) + compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.3) + middleman-core (= 3.3.7) middleman-sprockets (>= 3.1.2) - sass (>= 3.2.17, < 4.0) + sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.3) + middleman-core (3.3.7) activesupport (~> 4.1.0) bundler (~> 1.1) erubis hooks (~> 0.3) i18n (~> 0.6.9) - listen (~> 1.1) - padrino-helpers (~> 0.12.1) + listen (>= 2.7.9, < 3.0) + padrino-helpers (~> 0.12.3) rack (>= 1.4.5, < 2.0) rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-deploy (0.2.4) - middleman-core (>= 3.0.0) + middleman-deploy (1.0.0) + middleman-core (>= 3.2) net-sftp ptools - middleman-livereload (3.1.1) - em-websocket (>= 0.2.0) - middleman-core (>= 3.0.2) - multi_json (~> 1.0) - rack-livereload - middleman-sprockets (3.3.2) - middleman-core (>= 3.2) - sprockets (~> 2.2) + middleman-livereload (3.4.2) + em-websocket (~> 0.5.1) + middleman-core (>= 3.3) + rack-livereload (~> 0.3.15) + middleman-sprockets (3.4.1) + middleman-core (>= 3.3) + sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.0.0) - minitest (5.3.4) + sprockets-sass (~> 1.3.0) + minitest (5.5.1) multi_json (1.10.1) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.9.1) - padrino-helpers (0.12.2) + net-ssh (2.9.2) + padrino-helpers (0.12.4) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.2) + padrino-support (= 0.12.4) tilt (~> 1.4.1) - padrino-support (0.12.2) + padrino-support (0.12.4) activesupport (>= 3.1) - ptools (1.2.4) + ptools (1.3.2) rack (1.5.2) rack-livereload (0.3.15) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rb-fsevent (0.9.4) - rb-inotify (0.9.4) - ffi (>= 0.5.0) - rb-kqueue (0.2.3) + rb-inotify (0.9.5) ffi (>= 0.5.0) - sass (3.2.19) - sprockets (2.12.1) + sass (3.4.10) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.1.0) sprockets (~> 2.0) - sprockets-sass (1.0.3) + sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tzinfo (1.2.1) + timers (4.0.1) + hitimes + tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.6) - uglifier (2.5.0) + uber (0.0.13) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -125,11 +135,11 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 3.1.1.1) - compass (~> 0.12.6) - middleman (~> 3.3.3) - middleman-deploy (~> 0.2.4) - middleman-livereload (~> 3.1.0) - middleman-sprockets (= 3.3.2) + bootstrap-sass (~> 3.3.3) + compass (~> 1.0.3) + middleman (~> 3.3.7) + middleman-deploy (~> 1.0.0) + middleman-livereload (~> 3.4.2) + middleman-sprockets (= 3.4.1) tzinfo-data wdm (~> 0.1.0) diff --git a/source/assets/javascripts/application.js.coffee b/source/assets/javascripts/application.js.coffee index 30bae7c..ba582e5 100644 --- a/source/assets/javascripts/application.js.coffee +++ b/source/assets/javascripts/application.js.coffee @@ -1,5 +1,6 @@ #= require bootstrap #= require_tree +####if modernizr added dont need html5shiv (http://modernizr.com/docs) $(document).ready -> diff --git a/source/assets/javascripts/vendor/html5shiv.js b/source/assets/javascripts/vendor/html5shiv.js deleted file mode 100755 index dcf351c..0000000 --- a/source/assets/javascripts/vendor/html5shiv.js +++ /dev/null @@ -1,8 +0,0 @@ -/* - HTML5 Shiv v3.6.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed -*/ -(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag(); -a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x"; -c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| -"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video",version:"3.6.2",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment(); -for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d