mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 15:20:13 +01:00
Merge pull request #1920 from TracksApp/incremental-bootstrap-ui
Add in Bootstrap for UI bits
This commit is contained in:
commit
48c1d7c214
3 changed files with 14 additions and 0 deletions
2
Gemfile
2
Gemfile
|
|
@ -43,6 +43,8 @@ gem 'bcrypt', '~> 3.1.7'
|
|||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||
# gem 'jbuilder', '~> 1.2'
|
||||
|
||||
gem "bootstrap-sass", "3.3.3"
|
||||
|
||||
group :development do
|
||||
gem "spring"
|
||||
gem "spring-commands-cucumber"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,13 @@ GEM
|
|||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
autoprefixer-rails (5.1.0)
|
||||
execjs
|
||||
json
|
||||
bcrypt (3.1.9)
|
||||
bootstrap-sass (3.3.3)
|
||||
autoprefixer-rails (>= 5.0.0.1)
|
||||
sass (>= 3.2.19)
|
||||
builder (3.2.2)
|
||||
bullet (4.14.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -228,6 +234,7 @@ DEPENDENCIES
|
|||
acts_as_list
|
||||
aruba (>= 0.5.4)
|
||||
bcrypt (~> 3.1.7)
|
||||
bootstrap-sass (= 3.3.3)
|
||||
bullet
|
||||
capybara
|
||||
codeclimate-test-reporter
|
||||
|
|
|
|||
|
|
@ -14,3 +14,8 @@
|
|||
*= require_tree ../../../vendor/assets/stylesheets
|
||||
*= require tracks
|
||||
*/
|
||||
|
||||
.bootstrap {
|
||||
@import "bootstrap-sprockets";
|
||||
@import "bootstrap";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue