From 4fbfce385a7cb03a99fe9e1052db179e94a0837b Mon Sep 17 00:00:00 2001
From: Nikita Kholin <nik.kholin@gmail.com>
Date: Mon, 30 Jan 2017 13:37:02 +0200
Subject: [PATCH] Add bootstrap

---
 Gemfile                                 |  1 +
 Gemfile.lock                            |  8 +++++++-
 app/assets/stylesheets/application.css  | 15 ---------------
 app/assets/stylesheets/application.scss |  7 +++++++
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/assets/stylesheets/application.scss

diff --git a/Gemfile b/Gemfile
index 37c1c53..0581c09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
+gem 'bootstrap-sass', '~> 3.3.6'
 gem 'coffee-rails', '~> 4.2'
 gem 'devise'
 gem 'jbuilder', '~> 2.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 90bbf4c..45aeb54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,11 +42,16 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     arel (7.1.4)
     ast (2.3.0)
+    autoprefixer-rails (6.7.0)
+      execjs
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     bcrypt (3.1.11)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.3)
     byebug (9.0.6)
     capybara (2.11.0)
@@ -300,6 +305,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass (~> 3.3.6)
   byebug
   capybara
   coffee-rails (~> 4.2)
@@ -333,4 +339,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.13.7
+   1.14.3
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index 0ebd7fe..0000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -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 any plugin's vendor/assets/stylesheets directory 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 other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 0000000..8c26f8c
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,7 @@
+/*
+ *= require_tree .
+ *= require_self
+ */
+
+@import "bootstrap-sprockets";
+@import "bootstrap";