Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

app/assets/stylesheets/generic/mobile.scss

-/** Common mobile (screen XS) styles **/
+/** Common mobile (screen XS, SM) styles **/
 @media (max-width: $screen-xs-max) {
   .container .content {
     margin-top: 20px;
@@ -13,5 +13,37 @@
       display: none;
     }
   }
+
+  .issues-filters,
+  .dash-projects-filters,
+  .check-all-holder {
+    display: none;
+  }
+
+  .rss-btn {
+    display: none !important;
+  }
+
+  .project-home-panel {
+    .star-fork-buttons {
+      padding-top: 10px;
+      padding-right: 15px;
+    }
+  }
+
+  .project-home-links {
+    display: none;
+  }
 }
 
+@media (max-width: $screen-sm-max) {
+  .issues-filters {
+    .milestone-filter, .labels-filter {
+      display: none;
+    }
+  }
+
+  .page-title .new-issue-link {
+    display: none;
+  }
+}

app/assets/stylesheets/sections/nav_sidebar.scss

 .page-with-sidebar {
   background: #F5F5F5;
+
+  .sidebar-wrapper {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    border-right: 1px solid #EAEAEA;
+  }
 }
 
 .sidebar-wrapper {
@@ -97,11 +105,6 @@
 
   .sidebar-wrapper {
     width: 250px;
-    position: fixed;
-    left: 250px;
-    height: 100%;
-    margin-left: -250px;
-    border-right: 1px solid #EAEAEA;
 
     .nav-sidebar {
       margin-top: 20px;
@@ -123,11 +126,6 @@
 
   .sidebar-wrapper {
     width: 52px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100%;
-    border-right: 1px solid #EAEAEA;
     overflow-x: hidden;
 
     .nav-sidebar {
@@ -157,5 +155,3 @@
 @media(min-width: $screen-sm-max) {
   @include expanded-sidebar;
 }
-
-

app/assets/stylesheets/sections/projects.scss

@@ -296,20 +296,6 @@ ul.nav.nav-projects-tabs {
   }
 }
 
-@media (max-width: $screen-xs-max) {
-  .project-home-panel {
-    .star-fork-buttons {
-      padding-top: 10px;
-      padding-right: 15px;
-    }
-  }
-
-  .project-home-links {
-    display: none;
-  }
-}
-
-
 table.table.protected-branches-list tr.no-border {
   th, td {
     border: 0;

app/views/projects/_issues_nav.html.haml

@@ -19,11 +19,6 @@
       Labels
 
 
-  - if current_controller?(:milestones)
-    %li.pull-right
-      %button.btn.btn-default.sidebar-expand-button
-        %i.icon.fa.fa-list
-
   - if current_controller?(:issues)
     - if current_user
       %li.hidden-xs
@@ -32,9 +27,6 @@
 
     %li.pull-right
       .pull-right
-        %button.btn.btn-default.sidebar-expand-button
-          %i.icon.fa.fa-list
-
         .pull-left
           = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form'  do
             .append-right-10.hidden-xs.hidden-sm
@@ -53,9 +45,6 @@
   - if current_controller?(:merge_requests)
     %li.pull-right
       .pull-right
-        %button.btn.btn-default.sidebar-expand-button
-          %i.icon.fa.fa-list
-
         - if can? current_user, :write_merge_request, @project
           = link_to new_project_merge_request_path(@project), class: "btn btn-new pull-left", title: "New Merge Request" do
             %i.fa.fa-plus

app/views/projects/issues/show.html.haml

@@ -10,7 +10,7 @@
 
   .pull-right
     - if can?(current_user, :write_issue, @project)
-      = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
+      = link_to new_project_issue_path(@project), class: "btn btn-grouped new-issue-link", title: "New Issue", id: "new_issue_link" do
         %i.fa.fa-plus
         New Issue
     - if can?(current_user, :modify_issue, @issue)

app/views/shared/_milestones_filter.html.haml

-.fixed.sidebar-expand-button.hidden-lg.hidden-md
-  %i.fa.fa-list.fa-2x
-.responsive-side.milestones-filters.append-bottom-10
+.milestones-filters.append-bottom-10
   %ul.nav.nav-pills.nav-compact
     %li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
       = link_to milestones_filter_path(state: 'opened') do