Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Added bootstrap-sass gem and added twitter bootstrap css to the app
- Loading branch information
Showing
11 changed files
with
116 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,3 +13,4 @@ | |
//= require jquery | ||
//= require jquery_ujs | ||
//= require_tree . | ||
//= require bootstrap |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* 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 vendor/assets/stylesheets of plugins, if any, 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 top of the | ||
* compiled file, but it's generally better to create a new file per style scope. | ||
* | ||
*= require_self | ||
*= require_tree . | ||
*/ | ||
|
||
.content { | ||
background-color: #eee; | ||
padding: 20px; | ||
margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */ | ||
-webkit-border-radius: 0 0 6px 6px; | ||
-moz-border-radius: 0 0 6px 6px; | ||
border-radius: 0 0 6px 6px; | ||
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15); | ||
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15); | ||
box-shadow: 0 1px 2px rgba(0,0,0,.15); | ||
} | ||
|
||
html, body, .container, .content { | ||
height: 100%; | ||
} | ||
|
||
.container, .content { | ||
position: relative; | ||
} | ||
|
||
.wrapper { | ||
min-height: 100%; | ||
height: auto !important; | ||
height: 100%; | ||
margin: 0 auto -50px; /* same as the footer */ | ||
} | ||
|
||
.push { | ||
height: 50px; /* same as the footer */ | ||
} | ||
.footer-wrapper { | ||
position: relative; | ||
height: 50px; | ||
} | ||
|
||
footer{ | ||
text-align: center; | ||
display: block inline; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
@import "bootstrap"; | ||
body { padding-top: 60px; } | ||
@import "bootstrap-responsive"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
<footer> | ||
<nav class="round"> | ||
<ul> | ||
<li><%= link_to "About", about_path %></li> | ||
<li><%= link_to "Contact", contact_path %></li> | ||
<li><%= link_to "Tutorial", 'http://railstutorial.org' %></li> | ||
</ul> | ||
</nav> | ||
</footer> | ||
<li><%= link_to "About", about_path %></li> | ||
<li><%= link_to "Contact", contact_path %></li> | ||
<li><%= link_to "Tutorial", 'http://railstutorial.org' %></li> | ||
</ul> | ||
</footer> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,20 @@ | ||
<header> | ||
<%= link_to logo, root_path %> | ||
<!-- <header> | ||
<nav class ="round"> | ||
<ul class="list"> | ||
<li><%= link_to "Home", root_path %></li> | ||
<li><%= link_to "Help", help_path %></li> | ||
<li><%= link_to "Sign in", signup_path %></li> | ||
</ul> | ||
</nav> | ||
</header> | ||
--> | ||
|
||
<header class="navbar navbar-fixed-top"> | ||
<nav class="navbar-inner"> | ||
<div class="container"> | ||
<ul class="nav"> | ||
<li><%= link_to "Home", root_path %></li> | ||
<li><%= link_to "Help", help_path %></li> | ||
<li><%= link_to "Sign in", signup_path %></li> | ||
</ul> | ||
</div> | ||
</nav> | ||
<%= link_to logo, root_path %> | ||
</header> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,3 @@ | ||
<%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %> | ||
<%= stylesheet_link_tag 'blueprint/print', :media => 'print' %> | ||
<!--[if lt IE 9]> | ||
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"> | ||
</script> | ||
<![endif]--> | ||
<!--[if lt IE 8] | ||
<%= stylesheet_link_tag 'blueprint/ie' %> | ||
<![endif]--> | ||
<%= stylesheet_link_tag 'custom', :media => 'screen'%> | ||
<%= stylesheet_link_tag "application", :media => "all" %> | ||
<%= javascript_include_tag "application" %> | ||
<%= csrf_meta_tags %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters