From 737854e6c9fc286e9f659e1f8f4ab3c59570dc67 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 10 Apr 2018 13:10:52 -0500
Subject: [PATCH] [skip ci] Convert navbar-toggle to navbar-toggler

---
 app/assets/javascripts/main.js                     | 2 +-
 app/assets/stylesheets/framework/gitlab_theme.scss | 6 +++---
 app/assets/stylesheets/framework/header.scss       | 2 +-
 app/views/layouts/header/_default.html.haml        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 2c80baba10b..2b7d8fdd8fc 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -189,7 +189,7 @@ document.addEventListener('DOMContentLoaded', () => {
     $container.remove();
   });
 
-  $('.navbar-toggle').on('click', () => {
+  $('.navbar-toggler').on('click', () => {
     $('.header-content').toggleClass('menu-expanded');
     gl.lazyLoader.loadCheck();
   });
diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index 442a32ac6e0..23c7e0a2a0d 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -21,7 +21,7 @@
     }
 
     .container-fluid {
-      .navbar-toggle {
+      .navbar-toggler {
         border-left: 1px solid lighten($color-700, 10%);
       }
     }
@@ -289,8 +289,8 @@ body {
       }
 
       .container-fluid {
-        .navbar-toggle,
-        .navbar-toggle:hover {
+        .navbar-toggler,
+        .navbar-toggler:hover {
           color: $theme-gray-700;
           border-left: 1px solid $theme-gray-200;
         }
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index bf0a33bbfd0..e463c174a71 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -156,7 +156,7 @@
       }
     }
 
-    .navbar-toggle {
+    .navbar-toggler {
       right: -10px;
       border-radius: 0;
       min-width: 45px;
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index bf155480f34..ca2aaf9ee1e 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -78,7 +78,7 @@
               %div
                 = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
 
-      %button.navbar-toggle.d-block.d-sm-none{ type: 'button' }
+      %button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
         %span.sr-only Toggle navigation
         = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right')
         = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')