Merge pull request #68 from mobirobo/navbar_bootstrap3

Navigation bar working with both Bootstrap 2 and Bootstrap 3
resque · Aug 22, 2014 · 962b5b0 · 962b5b0
2 parents a103991 + 3f6789b
commit 962b5b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/stylesheets/resque_web/bootstrap_and_overrides.css.scss.erb b/app/assets/stylesheets/resque_web/bootstrap_and_overrides.css.scss.erb
@@ -18,7 +18,7 @@ body {
  border-bottom: 5px solid #ce1212;
 }
 
-.navbar .brand {
+.navbar .brand, .navbar .navbar-brand {
  color: white;
 }
 

diff --git a/app/views/layouts/resque_web/application.html.erb b/app/views/layouts/resque_web/application.html.erb
@@ -15,15 +15,15 @@
 <div class="navbar navbar-inverse navbar-fixed-top">
  <div class="navbar-inner">
  <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <a class="btn btn-navbar navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar"></span>
  </a>
  <%= image_tag "resque_web/lifebuoy.png", class: 'logo' %>
- <%= link_to "Resque.", ResqueWeb::Engine.app.url_helpers.root_path, :class => "brand" %>
- <div class="nav-collapse collapse">
- <ul class="nav">
+ <%= link_to "Resque", ResqueWeb::Engine.app.url_helpers.root_path, :class => "brand navbar-brand" %>
+ <div class="nav-collapse navbar-collapse collapse">
+ <ul class="nav navbar-nav">
  <% tabs.each do |tab_name,path| %>
  <%= tab tab_name,path %>
  <% end %>