Fix duplicate hamburger button

Keep ignoring app/themes but include app/theme/default
Remove sidebar collapsed button from topbar
Add sidebar collapsed button to user row
Make user-sidebar flex

.gitignore

@@ -33,6 +33,7 @@
 
 # Ignore additional themes
 /app/themes/*
+!/app/themes/default/*
 
 # Ignore public download/upload folders
 /public/downloads/*

app/assets/stylesheets/course/layout.scss

@@ -86,6 +86,7 @@
       @include text-overflow;
       font-size: 18px;
       font-weight: bold;
+      flex: 1;
     }
 
     .image,

app/themes/default/views/layouts/_topbar.html.slim

@@ -7,13 +7,6 @@ nav.navbar.navbar-inverse.navbar-fixed-top role="navigation"
         span.icon-bar
         span.icon-bar
         span.icon-bar
-      - if sidebar?
-        button.navbar-toggle.collapsed type="button" data-toggle="collapse" data-target=".sidebar" aria-expanded="false" aria-controls="navbar"
-          span.sr-only
-            = t('layout.navbar.toggle_sidebar')
-          span.icon-bar
-          span.icon-bar
-          span.icon-bar
       a.navbar-brand href=root_path
         = t('layout.coursemology')
     div.collapse.navbar-collapse#site-navigation-navbar

app/views/layouts/course.html.slim

@@ -11,6 +11,8 @@
           div.col-xs-12.user
             = display_user_image(current_user)
             span#user-sidebar = link_to_user(current_course_user || current_user)
+            button.btn.btn-default.navbar-toggle.collapsed.pull-right type="button" data-toggle="collapse" data-target="#course-navigation-sidebar" aria-expanded="false" aria-controls="navbar"
+              span.glyphicon.glyphicon-menu-hamburger
           - if current_course_user.student? && current_course.gamified?
             = display_course_user_badge(current_course_user)
       nav.navbar-default role='navigation'

config/locales/en/layout.yml

@@ -2,7 +2,6 @@ en:
   layout:
     coursemology: 'Coursemology'
     navbar:
-      toggle_sidebar: 'Toggle Sidebar'
       toggle_navigation: 'Toggle Navigation'
       courses: 'Courses'
       all_courses: 'All Courses'