1
0
Fork 0

Add Bootstrap

This commit is contained in:
Andrew Tomaka 2014-10-02 16:50:51 -04:00
parent 4e9168bc5f
commit 458a29d12f
6 changed files with 10 additions and 15 deletions

View File

@ -14,3 +14,4 @@ gem 'sdoc', '~> 0.4.0', group: :doc
gem 'spring', group: :development
gem 'omniauth-google-oauth2', '~> 0.2.5'
gem 'bootstrap-sass', '~> 3.2.0.2'

View File

@ -28,6 +28,8 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
@ -131,6 +133,7 @@ PLATFORMS
ruby
DEPENDENCIES
bootstrap-sass (~> 3.2.0.2)
coffee-rails (~> 4.0.0)
jbuilder (~> 2.0)
jquery-rails

View File

@ -11,6 +11,7 @@
// about supported directives.
//
//= require jquery
//= require bootstrap-sprockets
//= require jquery_ujs
//= require turbolinks
//= require_tree .

View File

@ -1,15 +0,0 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require_tree .
*= require_self
*/

View File

@ -0,0 +1,5 @@
//= require_tree .
//= require_self
//= require 'custom'
@import 'bootstrap-sprockets';
@import 'bootstrap';

View File