Fix sidebar conflicts

app/assets/javascripts/new_sidebar.js

@@ -45,15 +45,10 @@ export default class NewNavSidebar {
 
   toggleCollapsedSidebar(collapsed) {
     this.$sidebar.toggleClass('sidebar-icons-only', collapsed);
-<<<<<<< HEAD
-    this.$page.toggleClass('page-with-new-sidebar', !collapsed);
-    this.$page.toggleClass('page-with-icon-sidebar', collapsed);
-=======
     if (this.$sidebar.length) {
       this.$page.toggleClass('page-with-new-sidebar', !collapsed);
       this.$page.toggleClass('page-with-icon-sidebar', collapsed);
     }
->>>>>>> upstream/master
     NewNavSidebar.setCollapsedCookie(collapsed);
   }
 

app/assets/stylesheets/new_sidebar.scss

@@ -15,13 +15,9 @@ $new-sidebar-width: 220px;
 $new-sidebar-collapsed-width: 50px;
 
 .page-with-new-sidebar {
-<<<<<<< HEAD
-  padding-left: $new-sidebar-collapsed-width;
-=======
   @media (min-width: $screen-md-min) {
     padding-left: $new-sidebar-collapsed-width;
   }
->>>>>>> upstream/master
 
   @media (min-width: $screen-lg-min) {
     padding-left: $new-sidebar-width;
@@ -108,21 +104,14 @@ $new-sidebar-collapsed-width: 50px;
   &.sidebar-icons-only {
     width: $new-sidebar-collapsed-width;
 
-<<<<<<< HEAD
-    .nav-item-name,
-=======
->>>>>>> upstream/master
     .badge,
     .project-title {
       display: none;
     }
-<<<<<<< HEAD
-=======
 
     .nav-item-name {
       opacity: 0;
     }
->>>>>>> upstream/master
   }
 
   &.nav-sidebar-expanded {
@@ -242,11 +231,7 @@ $new-sidebar-collapsed-width: 50px;
           position: fixed;
           top: 0;
           left: $new-sidebar-width;
-<<<<<<< HEAD
-          width: 150px;
-=======
           min-width: 150px;
->>>>>>> upstream/master
           margin-top: -1px;
           padding: 8px 1px;
           background-color: $white-light;
@@ -343,33 +328,19 @@ $new-sidebar-collapsed-width: 50px;
 
 // Collapsed nav
 
-<<<<<<< HEAD
-.toggle-sidebar-button {
-=======
 .toggle-sidebar-button,
 .close-nav-button {
->>>>>>> upstream/master
   width: $new-sidebar-width - 2px;
   position: fixed;
   bottom: 0;
   padding: 16px;
   background-color: $gray-normal;
-<<<<<<< HEAD
-=======
   border: 0;
->>>>>>> upstream/master
   border-top: 2px solid $border-color;
   color: $gl-text-color-secondary;
   display: flex;
   align-items: center;
 
-<<<<<<< HEAD
-  @media (max-width: $screen-xs-max) {
-    display: none;
-  }
-
-=======
->>>>>>> upstream/master
   i {
     font-size: 20px;
     margin-right: 8px;
@@ -385,11 +356,6 @@ $new-sidebar-collapsed-width: 50px;
   }
 }
 
-<<<<<<< HEAD
-.sidebar-icons-only {
-  .context-header {
-    height: 60px;
-=======
 .toggle-sidebar-button {
   @media (max-width: $screen-xs-max) {
     display: none;
@@ -400,7 +366,6 @@ $new-sidebar-collapsed-width: 50px;
 .sidebar-icons-only {
   .context-header {
     height: 61px;
->>>>>>> upstream/master
 
     a {
       padding: 10px 4px;
@@ -429,10 +394,7 @@ $new-sidebar-collapsed-width: 50px;
 
   .toggle-sidebar-button {
     width: $new-sidebar-collapsed-width - 2px;
-<<<<<<< HEAD
-=======
     padding: 16px 18px;
->>>>>>> upstream/master
 
     .collapse-text,
     .fa-angle-double-left {
@@ -448,13 +410,10 @@ $new-sidebar-collapsed-width: 50px;
 
 // Mobile nav
 
-<<<<<<< HEAD
-=======
 .close-nav-button {
   display: none;
 }
 
->>>>>>> upstream/master
 .toggle-mobile-nav {
   display: none;
   background-color: transparent;

app/views/layouts/nav/_new_group_sidebar.html.haml

@@ -6,11 +6,7 @@
       .group-title
         = @group.name
   %ul.sidebar-top-level-items
-<<<<<<< HEAD
     = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
-=======
-    = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
->>>>>>> upstream/master
       = link_to group_path(@group), title: 'Group overview' do
         .nav-icon-container
           = custom_icon('project')
@@ -96,9 +92,6 @@
               %span
                 CI / CD
 
-<<<<<<< HEAD
           = render "groups/ee/settings_nav"
 
-=======
->>>>>>> upstream/master
   = render 'shared/sidebar_toggle_button'

app/views/shared/_sidebar_toggle_button.html.haml

@@ -2,10 +2,7 @@
   = icon('angle-double-left')
   = icon('angle-double-right')
   %span.collapse-text Collapse sidebar
-<<<<<<< HEAD
-=======
 
 = button_tag class: 'close-nav-button', type: 'button' do
   = icon ('times')
   %span.collapse-text Close sidebar
->>>>>>> upstream/master