diff --git a/Gemfile b/Gemfile index 6219184..28fcbd3 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' @@ -38,3 +38,9 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] +# Template engine +gem 'slim' + +# Twitter bootstrap +gem 'less-rails-bootstrap' +gem 'bootstrap_form', github: 'bootstrap-ruby/rails-bootstrap-forms' diff --git a/Gemfile.lock b/Gemfile.lock index 235806d..8c78c5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: git://github.com/bootstrap-ruby/rails-bootstrap-forms.git + revision: e21a746661d851e38b5f8545af1a2eaa81c4a27c + specs: + bootstrap_form (2.1.1) + GEM remote: https://rubygems.org/ specs: @@ -36,6 +42,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.1) + commonjs (0.2.7) erubis (2.7.0) execjs (2.2.1) hike (1.2.3) @@ -47,6 +54,14 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) + less (2.5.1) + commonjs (~> 0.2.7) + less-rails (2.5.0) + actionpack (>= 3.1) + less (~> 2.5.0) + less-rails-bootstrap (3.2.0) + less-rails (~> 2.5.0) + libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -75,6 +90,7 @@ GEM rake (10.3.2) rdoc (4.1.1) json (~> 1.4) + ref (1.0.5) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -84,6 +100,9 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + slim (2.0.3) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -95,6 +114,10 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) + temple (0.6.8) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -113,13 +136,17 @@ PLATFORMS ruby DEPENDENCIES + bootstrap_form! coffee-rails (~> 4.0.0) jbuilder (~> 2.0) jquery-rails + less-rails-bootstrap rails (= 4.1.4) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + slim spring sqlite3 + therubyracer turbolinks uglifier (>= 1.3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..4aa6e63 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,5 @@ //= require jquery //= require jquery_ujs //= require turbolinks +//= require twitter/bootstrap //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a443db3..d64bde5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,5 +11,7 @@ * file per style scope. * *= require_tree . + *= require custom_bootstrap/custom_bootstrap + *= require rails_bootstrap_forms *= require_self */ diff --git a/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less b/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less new file mode 100644 index 0000000..d9c8501 --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less @@ -0,0 +1,56 @@ +// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +// !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! +// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +// Core variables and mixins +@import "twitter/bootstrap/variables.less"; +@import "custom_bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc +@import "twitter/bootstrap/mixins.less"; +@import "custom_bootstrap/mixins.less"; // Modify this for custom mixins + +// Reset and dependencies +@import "twitter/bootstrap/normalize.less"; +@import "twitter/bootstrap/print.less"; +@import "twitter/bootstrap/glyphicons.less"; + +// Core CSS +@import "twitter/bootstrap/scaffolding.less"; +@import "twitter/bootstrap/type.less"; +@import "twitter/bootstrap/code.less"; +@import "twitter/bootstrap/grid.less"; +@import "twitter/bootstrap/tables.less"; +@import "twitter/bootstrap/forms.less"; +@import "twitter/bootstrap/buttons.less"; + +// Components +@import "twitter/bootstrap/component-animations.less"; +@import "twitter/bootstrap/dropdowns.less"; +@import "twitter/bootstrap/button-groups.less"; +@import "twitter/bootstrap/input-groups.less"; +@import "twitter/bootstrap/navs.less"; +@import "twitter/bootstrap/navbar.less"; +@import "twitter/bootstrap/breadcrumbs.less"; +@import "twitter/bootstrap/pagination.less"; +@import "twitter/bootstrap/pager.less"; +@import "twitter/bootstrap/labels.less"; +@import "twitter/bootstrap/badges.less"; +@import "twitter/bootstrap/jumbotron.less"; +@import "twitter/bootstrap/thumbnails.less"; +@import "twitter/bootstrap/alerts.less"; +@import "twitter/bootstrap/progress-bars.less"; +@import "twitter/bootstrap/media.less"; +@import "twitter/bootstrap/list-group.less"; +@import "twitter/bootstrap/panels.less"; +@import "twitter/bootstrap/responsive-embed.less"; +@import "twitter/bootstrap/wells.less"; +@import "twitter/bootstrap/close.less"; + +// Components w/ JavaScript +@import "twitter/bootstrap/modals.less"; +@import "twitter/bootstrap/tooltip.less"; +@import "twitter/bootstrap/popovers.less"; +@import "twitter/bootstrap/carousel.less"; + +// Utility classes +@import "twitter/bootstrap/utilities.less"; +@import "twitter/bootstrap/responsive-utilities.less"; diff --git a/app/assets/stylesheets/custom_bootstrap/mixins.less b/app/assets/stylesheets/custom_bootstrap/mixins.less new file mode 100644 index 0000000..44c24bd --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/mixins.less @@ -0,0 +1 @@ +// Use this file to override Twitter Bootstrap mixins or define own mixins. diff --git a/app/assets/stylesheets/custom_bootstrap/variables.less b/app/assets/stylesheets/custom_bootstrap/variables.less new file mode 100644 index 0000000..8d9f633 --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/variables.less @@ -0,0 +1 @@ +// Use this file to override Twitter Bootstrap variables or define own variables.