kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix login tabs

This commit is contained in:
Annabel Dunstone Gray 2018-05-24 19:32:40 -07:00
parent 1d2b414408
commit df76fd1675
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
6 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/bootstrap_migration.scss vendored
View File

@ -138,3 +138,7 @@ table {
@extend .border-0;
}
}
.nav-tabs .nav-link {
border: 0;
}

4
app/assets/stylesheets/framework/gitlab_theme.scss
View File

@ -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;

12
app/assets/stylesheets/framework/secondary_navigation_elements.scss
View File

@ -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;
}
}
}
}

4
app/views/devise/shared/_tab_single.html.haml
View File

@ -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

16
app/views/devise/shared/_tabs_ldap.html.haml
View File

@ -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'

8
app/views/devise/shared/_tabs_normal.html.haml
View File

@ -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