Permalink
Browse files

Use bootstrap-sass

* Remove application.css
  • Loading branch information...
1 parent 9bf63af commit 091301f6b8ce6e05701ada349f1d675820e67478 Joe Peck committed Jan 18, 2013
View
@@ -12,6 +12,7 @@ gem 'mysql2'
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
+ gem 'bootstrap-sass'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
View
@@ -22,6 +22,8 @@ GEM
activesupport (= 3.2.10)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
+ activerecord-postgresql-adapter (0.0.1)
+ pg
activeresource (3.2.10)
activemodel (= 3.2.10)
activesupport (= 3.2.10)
@@ -32,6 +34,8 @@ GEM
arel (3.0.2)
awesome_print (1.1.0)
bcrypt-ruby (3.0.1)
+ bootstrap-sass (2.2.2.0)
+ sass (~> 3.2)
builder (3.0.4)
capybara (2.0.2)
mime-types (>= 1.16)
@@ -176,6 +180,7 @@ GEM
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
orm_adapter (0.4.0)
+ pg (0.14.1)
polyglot (0.3.3)
pry (0.9.11.3)
coderay (~> 1.0.5)
@@ -286,6 +291,8 @@ PLATFORMS
ruby
DEPENDENCIES
+ activerecord-postgresql-adapter
+ bootstrap-sass
coffee-rails (~> 3.2.1)
cucumber-rails
debugger
View
Deleted file not rendered
@@ -10,4 +10,7 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
//
-//= require_tree .
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap
+//= require_tree .
@@ -11,4 +11,16 @@
*= require_self
*= require_tree .
*/
-//= require 'events'
+//= require 'events'
+
+.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);
+}
@@ -0,0 +1,3 @@
+@import "bootstrap";
+body { padding-top: 60px; }
+@import "bootstrap-responsive";
@@ -0,0 +1,8 @@
+<% flash.each do |name, msg| %>
+ <% if msg.is_a?(String) %>
+ <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
+ <a class="close" data-dismiss="alert">&#215;</a>
+ <%= content_tag :div, msg, :id => "flash_#{name}" %>
+ </div>
+ <% end %>
+<% end %>
@@ -0,0 +1,22 @@
+<%= link_to "Events", root_path, :class => 'brand' %>
+
+<ul class="nav">
+ <% if user_signed_in? %>
+ <li>
+ <button class="btn"><%= current_user %></button>
+ </li>
+ <li>
+ <button class="btn"><%= link_to 'Edit profile', edit_user_registration_path %></button>
+ </li>
+ <li>
+ <button class="btn"><%= link_to('Logout', destroy_user_session_path, :method=>'delete') %></button>
+ </li>
+ <% else %>
+ <li>
+ <button class="btn"><%= link_to "Sign in with Github", user_omniauth_authorize_path(:github) %></button>
+ </li>
+ <li>
+ <button class="btn"><%= link_to('Sign up', new_user_registration_path) %></button>
+ </li>
+ <% end %>
+</ul>
@@ -1,21 +1,38 @@
-<!DOCTYPE html>
+<!doctype html>
<html>
<head>
<title>Temptd</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title><%= content_for?(:title) ? yield(:title) : "Myapp" %></title>
+ <meta name="description" content="">
+ <meta name="author" content="">
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
+ <%= yield(:head) %>
</head>
<body>
- <% if current_user %>
- <strong><%= current_user %></strong>.
- <%= link_to 'Edit profile', edit_user_registration_path %> |
- <%= link_to "Logout", destroy_user_session_path %>
- <% else %>
- <p><%= link_to "Sign in with Github", user_omniauth_authorize_path(:github) %></p>
- <% end %>
- <p class="notice"><%= notice %></p>
- <p class="alert"><%= alert %></p>
- <%= yield %>
+ <header class="navbar navbar-fixed-top">
+ <nav class="navbar-inner">
+ <div class="container">
+ <%= render 'layouts/navigation' %>
+ </div>
+ </nav>
+ </header>
+ <div id="main" role="main">
+ <div class="container">
+ <div class="content">
+ <div class="row">
+ <div class="span12">
+ <%= render 'layouts/messages' %>
+ <%= yield %>
+ </div>
+ </div>
+ <footer>
+ </footer>
+ </div>
+ </div> <!--! end of .container -->
+ </div> <!--! end of #main -->
</body>
-</html>
+</html>

0 comments on commit 091301f

Please sign in to comment.