From df76fd1675218b5e7f892a84b32cb157f7d09d47 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 24 May 2018 19:32:40 -0700
Subject: [PATCH] Fix login tabs

---
 app/assets/stylesheets/bootstrap_migration.scss  |  4 ++++
 .../stylesheets/framework/gitlab_theme.scss      |  4 ++--
 .../framework/secondary_navigation_elements.scss | 12 ++++++------
 app/views/devise/shared/_tab_single.html.haml    |  4 ++--
 app/views/devise/shared/_tabs_ldap.html.haml     | 16 ++++++++--------
 app/views/devise/shared/_tabs_normal.html.haml   |  8 ++++----
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index a3baa9dc61e..cad545ab31b 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -138,3 +138,7 @@ table {
     @extend .border-0;
   }
 }
+
+.nav-tabs .nav-link {
+  border: 0;
+}
diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index 12d313a373c..d6ae8cbb416 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -169,8 +169,8 @@
     color: $color-800;
   }
 
-  .nav-links li.active a {
-    border-bottom-color: $color-500;
+  .nav-links li a.active {
+    border-bottom: 2px solid $color-500;
 
     .badge.badge-pill {
       font-weight: $gl-font-weight-bold;
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
index c33d808a01f..c3c64adf3da 100644
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -31,14 +31,14 @@
           color: $black;
         }
       }
-    }
 
-    &.active a {
-      color: $black;
-      font-weight: $gl-font-weight-bold;
-
-      .badge.badge-pill {
+      &.active {
         color: $black;
+        font-weight: $gl-font-weight-bold;
+
+        .badge.badge-pill {
+          color: $black;
+        }
       }
     }
   }
diff --git a/app/views/devise/shared/_tab_single.html.haml b/app/views/devise/shared/_tab_single.html.haml
index 3f2ed3e4576..5683b4207b4 100644
--- a/app/views/devise/shared/_tab_single.html.haml
+++ b/app/views/devise/shared/_tab_single.html.haml
@@ -1,3 +1,3 @@
 %ul.nav-links.new-session-tabs.single-tab.nav-tabs.nav
-  %li.active
-    %a= tab_title
+  %li.nav-item
+    %a.nav-link.active= tab_title
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml
index fac7f3135d1..087af61235b 100644
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
@@ -1,13 +1,13 @@
 %ul.nav-links.new-session-tabs.nav-tabs.nav{ class: ('custom-provider-tabs' if form_based_providers.any?) }
   - if crowd_enabled?
-    %li.active
-      = link_to "Crowd", "#crowd", 'data-toggle' => 'tab'
+    %li.nav-item
+      = link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab'
   - @ldap_servers.each_with_index do |server, i|
-    %li{ class: active_when(i.zero? && !crowd_enabled?) }
-      = link_to server['label'], "##{server['provider_name']}",  'data-toggle' => 'tab'
+    %li.nav-item{ class: active_when(i.zero? && !crowd_enabled?) }
+      = link_to server['label'], "##{server['provider_name']}", class: 'nav-link', 'data-toggle' => 'tab'
   - if password_authentication_enabled_for_web?
-    %li
-      = link_to 'Standard', '#login-pane', 'data-toggle' => 'tab'
+    %li.nav-item
+      = link_to 'Standard', '#login-pane', class: 'nav-link', 'data-toggle' => 'tab'
   - if allow_signup?
-    %li
-      = link_to 'Register', '#register-pane', 'data-toggle' => 'tab'
+    %li.nav-item
+      = link_to 'Register', '#register-pane', class: 'nav-link', 'data-toggle' => 'tab'
diff --git a/app/views/devise/shared/_tabs_normal.html.haml b/app/views/devise/shared/_tabs_normal.html.haml
index 5352f9cc21a..284d4fa1b89 100644
--- a/app/views/devise/shared/_tabs_normal.html.haml
+++ b/app/views/devise/shared/_tabs_normal.html.haml
@@ -1,6 +1,6 @@
 %ul.nav-links.new-session-tabs.nav-tabs.nav{ role: 'tablist' }
-  %li.active{ role: 'presentation' }
-    %a{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab' } Sign in
+  %li.nav-item{ role: 'presentation' }
+    %a.nav-link.active{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab' } Sign in
   - if allow_signup?
-    %li{ role: 'presentation' }
-      %a{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab' } Register
+    %li.nav-item{ role: 'presentation' }
+      %a.nav-link{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab' } Register