From bd9fbb4be9fd38e4e936d09ec5922ffecfdfcf70 Mon Sep 17 00:00:00 2001
From: anayib <nayib.abdala@gmail.com>
Date: Mon, 1 Dec 2014 09:56:22 -0500
Subject: [PATCH 1/5] add gem 'bootstrap-sass'

---
 Gemfile      | 2 ++
 Gemfile.lock | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 676edce..bfd0fc1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,8 @@ gem 'sdoc', '~> 0.4.0',          group: :doc
 gem 'devise'
 gem 'gravatar-ultimate'
 
+gem 'bootstrap-sass'
+
 group :development do
   gem 'pry' #debugger
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b18e36..b2ec167 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,6 +29,8 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
+    bootstrap-sass (3.3.1.0)
+      sass (~> 3.2)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -159,6 +161,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass
   coffee-rails (~> 4.0.0)
   devise
   gravatar-ultimate

From 0da901d954587dfde463980cfe0edfccb2a14238 Mon Sep 17 00:00:00 2001
From: anayib <nayib.abdala@gmail.com>
Date: Mon, 1 Dec 2014 10:01:27 -0500
Subject: [PATCH 2/5] create file bootstrap_customization.css.scss

---
 app/assets/stylesheets/bootstrap_customization.css.scss | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/stylesheets/bootstrap_customization.css.scss

diff --git a/app/assets/stylesheets/bootstrap_customization.css.scss b/app/assets/stylesheets/bootstrap_customization.css.scss
new file mode 100644
index 0000000..e69de29

From b3f36615f6fe85edee9f0559474061bd7ec8cb8a Mon Sep 17 00:00:00 2001
From: anayib <nayib.abdala@gmail.com>
Date: Mon, 1 Dec 2014 10:24:33 -0500
Subject: [PATCH 3/5] run db migration

---
 .../stylesheets/bootstrap_customization.css.scss      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/assets/stylesheets/bootstrap_customization.css.scss b/app/assets/stylesheets/bootstrap_customization.css.scss
index e69de29..8279e01 100644
--- a/app/assets/stylesheets/bootstrap_customization.css.scss
+++ b/app/assets/stylesheets/bootstrap_customization.css.scss
@@ -0,0 +1,11 @@
+$navbar-default-bg:#2980b9;
+$navbar-default-link-color: white;
+@import 'bootstrap';
+
+.center {
+     text-align: center;
+}
+
+.navbar-brand {
+     font-weight: bold;
+}
\ No newline at end of file

From 8a9878662343d2040c48aa22f7ac5c5e89e96ae6 Mon Sep 17 00:00:00 2001
From: anayib <nayib.abdala@gmail.com>
Date: Mon, 1 Dec 2014 10:38:51 -0500
Subject: [PATCH 4/5] add imports in css.scss file and changed nav-bar color

---
 app/assets/stylesheets/bootstrap_customization.css.scss | 8 +++++++-
 app/views/layouts/application.html.erb                  | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/bootstrap_customization.css.scss b/app/assets/stylesheets/bootstrap_customization.css.scss
index 8279e01..5e4e2ff 100644
--- a/app/assets/stylesheets/bootstrap_customization.css.scss
+++ b/app/assets/stylesheets/bootstrap_customization.css.scss
@@ -1,11 +1,17 @@
-$navbar-default-bg:#2980b9;
+$navbar-default-bg:#e67e22;
 $navbar-default-link-color: white;
+
+@import "bootstrap-sprockets";
 @import 'bootstrap';
 
 .center {
      text-align: center;
 }
 
+body {
+  color: black;
+}
+
 .navbar-brand {
      font-weight: bold;
 }
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2b30fbe..350b158 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,8 +5,7 @@
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+  
   
 </head>
 

From 27548d6ee6e4d645bb5f216569b4330e39c4a9cb Mon Sep 17 00:00:00 2001
From: anayib <nayib.abdala@gmail.com>
Date: Tue, 2 Dec 2014 09:08:47 -0500
Subject: [PATCH 5/5] add javascript for bootstrap

---
 app/assets/javascripts/application.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ab8208b..6fbdb6a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,5 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require bootstrap-sprockets
 // require turbolinks
 //= require_tree .