Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
df76fd16
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
df76fd16
编写于
5月 24, 2018
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix login tabs
上级
1d2b4144
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
26 addition
and
22 deletion
+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
未找到文件。
app/assets/stylesheets/bootstrap_migration.scss
浏览文件 @
df76fd16
...
...
@@ -138,3 +138,7 @@ table {
@extend
.border-0
;
}
}
.nav-tabs
.nav-link
{
border
:
0
;
}
app/assets/stylesheets/framework/gitlab_theme.scss
浏览文件 @
df76fd16
...
...
@@ -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
;
...
...
app/assets/stylesheets/framework/secondary_navigation_elements.scss
浏览文件 @
df76fd16
...
...
@@ -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
;
}
}
}
}
...
...
app/views/devise/shared/_tab_single.html.haml
浏览文件 @
df76fd16
%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
app/views/devise/shared/_tabs_ldap.html.haml
浏览文件 @
df76fd16
%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'
app/views/devise/shared/_tabs_normal.html.haml
浏览文件 @
df76fd16
%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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录