Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
df76fd16
Commit
df76fd16
authored
May 24, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix login tabs
parent
1d2b4144
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
22 deletions
+26
-22
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+4
-0
app/assets/stylesheets/framework/gitlab_theme.scss
app/assets/stylesheets/framework/gitlab_theme.scss
+2
-2
app/assets/stylesheets/framework/secondary_navigation_elements.scss
.../stylesheets/framework/secondary_navigation_elements.scss
+6
-6
app/views/devise/shared/_tab_single.html.haml
app/views/devise/shared/_tab_single.html.haml
+2
-2
app/views/devise/shared/_tabs_ldap.html.haml
app/views/devise/shared/_tabs_ldap.html.haml
+8
-8
app/views/devise/shared/_tabs_normal.html.haml
app/views/devise/shared/_tabs_normal.html.haml
+4
-4
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
df76fd16
...
@@ -138,3 +138,7 @@ table {
...
@@ -138,3 +138,7 @@ table {
@extend
.border-0
;
@extend
.border-0
;
}
}
}
}
.nav-tabs
.nav-link
{
border
:
0
;
}
app/assets/stylesheets/framework/gitlab_theme.scss
View file @
df76fd16
...
@@ -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
;
...
...
app/assets/stylesheets/framework/secondary_navigation_elements.scss
View file @
df76fd16
...
@@ -31,14 +31,14 @@
...
@@ -31,14 +31,14 @@
color
:
$black
;
color
:
$black
;
}
}
}
}
}
&
.active
a
{
color
:
$black
;
font-weight
:
$gl-font-weight-bold
;
.badge.badge-pill
{
&
.active
{
color
:
$black
;
color
:
$black
;
font-weight
:
$gl-font-weight-bold
;
.badge.badge-pill
{
color
:
$black
;
}
}
}
}
}
}
}
...
...
app/views/devise/shared/_tab_single.html.haml
View file @
df76fd16
%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
app/views/devise/shared/_tabs_ldap.html.haml
View file @
df76fd16
%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'
app/views/devise/shared/_tabs_normal.html.haml
View file @
df76fd16
%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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment