Add twitter bootstrap assets

relaxdiego · Mar 21, 2012 · 2892473 · 2892473
1 parent dfbc8c1
commit 2892473
Show file tree

Hide file tree

Showing 11 changed files with 7,120 additions and 2 deletions.
diff --git a/app/assets/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png
diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,3 +13,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require common
+//= require bootstrap.min
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,4 +11,6 @@
  *= require_self
  *= require scaffolds
  *= require common
+ *= require bootstrap.min
+ *= require bootstrap-responsive.min
 */
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,9 +8,15 @@
 </head>
 <body>
 
-<p class="notice"><%= notice %></p>
-<p class="alert"><%= alert %></p>
+<div class="container">
+<% if notice %>
+<div class="alert alert-success"><%= notice %></div>
+<% elsif alert %>
+<div class="alert alert-error"><%= alert %></div>
+<% end %>
+
 <%= yield %>
+</div>
 
 </body>
 </html>