navbar fixes

- don't use a fluid container here since we're not using it right now - add navbar-collapse to save space on mobile devices
mike-lang · Dec 13, 2014 · baac21c · baac21c
1 parent e8de454
commit baac21c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,4 +14,5 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require bootstrap/dropdown
+//= require bootstrap/collapse
 //= require_tree .
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,14 +14,18 @@
 </head>
 <body>
   <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="container-fluid">
+    <div class="container">
       <div class="navbar-header">
         <%= link_to root_url(subdomain: false), class: 'navbar-brand' do %>
           <%= image_tag 'logo.png', height: 30, alt: t('title'), title: t('title'), id: 'header-logo' %>
         <% end %>
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#mainmenu">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
       </div>
-      <ul class="nav navbar-nav navbar-right">
-        <!-- <li><%= link_to t('pages.about.menu_title'), about_url(subdomain: false) %></li> -->
+      <ul class="nav navbar-nav navbar-right collapse navbar-collapse" id="mainmenu">
         <li><%= link_to t('pages.get_involved.menu_title'), get_involved_url(subdomain: false) %></li>
         <li><%= link_to t('pages.blog.menu_title'), blog_index_url(subdomain: 'blog') %></li>
         <li><%= link_to t('.wiki'), 'https://wiki.diasporafoundation.org' %></li>