Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-19 16:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1920 from TracksApp/incremental-bootstrap-ui

Browse source 
Add in Bootstrap for UI bits
This commit is contained in:
Dan Rice 2015-08-21 08:52:47 -04:00
commit 48c1d7c214
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -43,6 +43,8 @@ gem 'bcrypt', '~> 3.1.7'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 1.2' # gem 'jbuilder', '~> 1.2'
gem "bootstrap-sass", "3.3.3"
group :development do group :development do
gem "spring" gem "spring"
gem "spring-commands-cucumber" gem "spring-commands-cucumber"

7
Gemfile.lock
View file

@ -39,7 +39,13 @@ GEM
childprocess (>= 0.3.6) childprocess (>= 0.3.6)
cucumber (>= 1.1.1) cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0) rspec-expectations (>= 2.7.0)
autoprefixer-rails (5.1.0)
execjs
json
bcrypt (3.1.9) bcrypt (3.1.9)
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
builder (3.2.2) builder (3.2.2)
bullet (4.14.0) bullet (4.14.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -228,6 +234,7 @@ DEPENDENCIES
acts_as_list acts_as_list
aruba (>= 0.5.4) aruba (>= 0.5.4)
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
bootstrap-sass (= 3.3.3)
bullet bullet
capybara capybara
codeclimate-test-reporter codeclimate-test-reporter

5
app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss
View file

@ -14,3 +14,8 @@
*= require_tree ../../../vendor/assets/stylesheets *= require_tree ../../../vendor/assets/stylesheets
*= require tracks *= require tracks
*/ */
.bootstrap {
@import "bootstrap-sprockets";
@import "bootstrap";
}