init bootstrap

jain-nikunj · Nov 14, 2017 · 09f292f · 09f292f
1 parent 1f960f4
commit 09f292f
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 79 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,8 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.1.0'
 
-gem 'bootstrap'
+gem 'bootstrap-sass'
+gem 'sprockets'
 
 gem "omniauth-google-oauth2"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,10 +46,9 @@ GEM
     backports (3.10.3)
     binding_of_caller (0.7.3)
       debug_inspector (>= 0.0.1)
-    bootstrap (4.0.0.beta2.1)
-      autoprefixer-rails (>= 6.0.3)
-      popper_js (>= 1.12.3, < 2)
-      sass (>= 3.5.2)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.3)
     byebug (9.1.0)
     capybara (2.16.0)
@@ -171,7 +170,6 @@ GEM
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     pg (0.20.0)
-    popper_js (1.12.5)
     public_suffix (3.0.1)
     rack (1.6.8)
     rack-test (0.6.3)
@@ -281,7 +279,7 @@ PLATFORMS
 
 DEPENDENCIES
   autotest-rails
-  bootstrap
+  bootstrap-sass
   byebug
   coffee-rails (~> 4.1.0)
   cucumber
@@ -301,6 +299,7 @@ DEPENDENCIES
   selenium-webdriver
   simplecov
   spring
+  sprockets
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,9 +10,7 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery3
-//= require popper
-//= require bootstrap
+//= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require_tree .
+//= require_tree .
diff --git a/app/views/buildings/index.html.erb b/app/views/buildings/index.html.erb
@@ -0,0 +1,51 @@
+<div class="navbar-page">
+  <div class="container">
+    <!-- Static navbar -->
+    <div class="navbar navbar-inverse" role="navigation">
+      <div class="container-fluid">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+          </ul>
+          <ul class="nav navbar-nav navbar-right">
+            <li class="active"><a href="./">Default</a></li>
+            <li><a href="../navbar-static-top/">Static top</a></li>
+            <li><a href="../navbar-fixed-top/">Fixed top</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div><!--/.container-fluid -->
+    </div>
+
+    <!-- Main component for a primary marketing message or call to action -->
+    <div class="jumbotron">
+      <h1>Navbar example</h1>
+      <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
+      <p>
+        <a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
+      </p>
+    </div>
+  </div> <!-- /container -->
+</div>
diff --git a/app/views/buildings/index.html.haml b/app/views/buildings/index.html.haml
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
+    <title>Room Reservation</title>
+    <%= stylesheet_link_tag "application", media: "all",
+                                           "data-turbolinks-track" => true %>
+    <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+    <%= csrf_meta_tags %>
+    <%= favicon_link_tag %>
+    <!-- Bootstrap core CSS -->
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <!-- library -->
+    <%= yield :library %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml