Skip to content

Commit

Permalink
Merge pull request #1 from mohanbabubb/bootstrap
Browse files Browse the repository at this point in the history
Bootstrap
  • Loading branch information
mohanbabubb authored Jul 19, 2017
2 parents d656f33 + b0bbaf6 commit 678e482
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 8 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ gem 'rails_admin_rollincode', '~> 1.0'
gem "devise"
gem "figaro"
gem 'rest-client'
gem 'bootstrap-sass'
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ GEM
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (8.0.0)
autoprefixer-rails (7.1.2.2)
execjs
bcrypt (3.1.11)
bindex (0.5.0)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.3)
byebug (9.0.6)
capybara (2.14.4)
Expand Down Expand Up @@ -255,6 +260,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ application up and running.
Things you may want to cover:

* Ruby version
2.3.0

* System dependencies

Expand Down
2 changes: 2 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
// about supported directives.
//
//= require rails-ujs
//= require jquery
//= require bootstrap-sprockets
//= require turbolinks
//= require_tree .
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@
*= require_tree .
*= require_self
*/
@import "bootstrap-sprockets";
@import "bootstrap";
39 changes: 37 additions & 2 deletions app/views/home/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,37 @@
<h1>Home#index</h1>
<p>Find me in app/views/home/index.html.erb</p>
<div class="container">

<div class="row">

<div class="col-md-3">
<p class="lead">Links</p>
<div class="list-group">
<a href="#" class="list-group-item active">Builpacks</a>
<a href="#" class="list-group-item">Deployments</a>
<a href="#" class="list-group-item">Releases</a>
</div>
</div>

<div class="col-md-9">
<p class="lead">Builpacks</p>
<div class="panel panel-default">
<div class="panel-body">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>Firstname</th>
<th>Lastname</th>
<th>Email</th>
</tr>
</thead>
<tbody>
<tr>
<td>John</td>
<td>Doe</td>
<td>[email protected]</td>
</tr>
</div>
</div>

</div>
</div>
</div>
13 changes: 7 additions & 6 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<title>InfernoTool</title>
<html lang="en">
<head>
<title>InfernoTool</title>
<%= csrf_meta_tags %>

<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

<body>
<%= yield %>
<body>
<%= render "shared/header" %>
<br><br><br><br>
<%= yield %>
</body>
</html>
34 changes: 34 additions & 0 deletions app/views/shared/_header.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!-- Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<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="#">Inferno Tool</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<a href="#">Home</a>
</li>
<li>
<a href="#">Projects</a>
</li>
<li>
<a href="#">History</a>
</li>
<li>
<a href="#">Manage</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>

0 comments on commit 678e482

Please sign in to comment.