Configure Bootstrap

makeitrealcamp · Aug 20, 2017 · e366ac4 · e366ac4
1 parent bb2a5f7
commit e366ac4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -54,3 +54,4 @@ end
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'devise'
+gem 'bootstrap', '~> 4.0.0.beta'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -41,8 +41,14 @@ GEM
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (8.0.0)
+    autoprefixer-rails (7.1.2.6)
+      execjs
     bcrypt (3.1.11)
     bindex (0.5.0)
+    bootstrap (4.0.0.beta)
+      autoprefixer-rails (>= 6.0.3)
+      popper_js (~> 1.11.1)
+      sass (>= 3.4.19)
     builder (3.2.3)
     byebug (9.0.6)
     capybara (2.15.1)
@@ -97,6 +103,7 @@ GEM
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
+    popper_js (1.11.1)
     public_suffix (2.0.5)
     puma (3.10.0)
     rack (2.0.3)
@@ -188,6 +195,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap (~> 4.0.0.beta)
   byebug
   capybara (~> 2.13)
   coffee-rails (~> 4.2)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -0,0 +1,2 @@
+@import "theme";
+@import "bootstrap";
diff --git a/app/assets/stylesheets/theme.scss b/app/assets/stylesheets/theme.scss
@@ -0,0 +1 @@
+$text-color:                       #303030;