Commit df76fd16 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix login tabs

parent 1d2b4144
...@@ -138,3 +138,7 @@ table { ...@@ -138,3 +138,7 @@ table {
@extend .border-0; @extend .border-0;
} }
} }
.nav-tabs .nav-link {
border: 0;
}
...@@ -169,8 +169,8 @@ ...@@ -169,8 +169,8 @@
color: $color-800; color: $color-800;
} }
.nav-links li.active a { .nav-links li a.active {
border-bottom-color: $color-500; border-bottom: 2px solid $color-500;
.badge.badge-pill { .badge.badge-pill {
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
......
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
color: $black; color: $black;
} }
} }
}
&.active a { &.active {
color: $black; color: $black;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
...@@ -42,6 +41,7 @@ ...@@ -42,6 +41,7 @@
} }
} }
} }
}
} }
.top-area { .top-area {
......
%ul.nav-links.new-session-tabs.single-tab.nav-tabs.nav %ul.nav-links.new-session-tabs.single-tab.nav-tabs.nav
%li.active %li.nav-item
%a= tab_title %a.nav-link.active= tab_title
%ul.nav-links.new-session-tabs.nav-tabs.nav{ class: ('custom-provider-tabs' if form_based_providers.any?) } %ul.nav-links.new-session-tabs.nav-tabs.nav{ class: ('custom-provider-tabs' if form_based_providers.any?) }
- if crowd_enabled? - if crowd_enabled?
%li.active %li.nav-item
= link_to "Crowd", "#crowd", 'data-toggle' => 'tab' = link_to "Crowd", "#crowd", class: 'nav-link active', 'data-toggle' => 'tab'
- @ldap_servers.each_with_index do |server, i| - @ldap_servers.each_with_index do |server, i|
%li{ class: active_when(i.zero? && !crowd_enabled?) } %li.nav-item{ class: active_when(i.zero? && !crowd_enabled?) }
= link_to server['label'], "##{server['provider_name']}", 'data-toggle' => 'tab' = link_to server['label'], "##{server['provider_name']}", class: 'nav-link', 'data-toggle' => 'tab'
- if password_authentication_enabled_for_web? - if password_authentication_enabled_for_web?
%li %li.nav-item
= link_to 'Standard', '#login-pane', 'data-toggle' => 'tab' = link_to 'Standard', '#login-pane', class: 'nav-link', 'data-toggle' => 'tab'
- if allow_signup? - if allow_signup?
%li %li.nav-item
= link_to 'Register', '#register-pane', 'data-toggle' => 'tab' = link_to 'Register', '#register-pane', class: 'nav-link', 'data-toggle' => 'tab'
%ul.nav-links.new-session-tabs.nav-tabs.nav{ role: 'tablist' } %ul.nav-links.new-session-tabs.nav-tabs.nav{ role: 'tablist' }
%li.active{ role: 'presentation' } %li.nav-item{ role: 'presentation' }
%a{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab' } Sign in %a.nav-link.active{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab' } Sign in
- if allow_signup? - if allow_signup?
%li{ role: 'presentation' } %li.nav-item{ role: 'presentation' }
%a{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab' } Register %a.nav-link{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab' } Register
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment