Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8a0acaf8
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,发现更多精彩内容 >>
提交
8a0acaf8
编写于
5月 31, 2018
作者:
A
Annabel Gray
提交者:
Clement Ho
5月 31, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix active tab styling
上级
afac3f02
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
36 addition
and
26 deletion
+36
-26
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+8
-2
app/assets/stylesheets/framework/gitlab_theme.scss
app/assets/stylesheets/framework/gitlab_theme.scss
+7
-4
app/assets/stylesheets/framework/secondary_navigation_elements.scss
.../stylesheets/framework/secondary_navigation_elements.scss
+7
-6
app/views/shared/milestones/_tabs.html.haml
app/views/shared/milestones/_tabs.html.haml
+10
-10
spec/features/projects/milestones/milestone_spec.rb
spec/features/projects/milestones/milestone_spec.rb
+4
-4
未找到文件。
app/assets/stylesheets/bootstrap_migration.scss
浏览文件 @
8a0acaf8
...
...
@@ -148,8 +148,14 @@ table {
}
}
.nav-tabs
.nav-link
{
border
:
0
;
.nav-tabs
{
.nav-link
{
border
:
0
;
}
.nav-item
{
margin-bottom
:
0
;
}
}
pre
code
{
...
...
app/assets/stylesheets/framework/gitlab_theme.scss
浏览文件 @
8a0acaf8
...
...
@@ -169,11 +169,14 @@
color
:
$color-800
;
}
.nav-links
li
a
.active
{
border-bottom
:
2px
solid
$color-500
;
.nav-links
li
{
&
.active
a
,
a
.active
{
border-bottom
:
2px
solid
$color-500
;
.badge.badge-pill
{
font-weight
:
$gl-font-weight-bold
;
.badge.badge-pill
{
font-weight
:
$gl-font-weight-bold
;
}
}
}
...
...
app/assets/stylesheets/framework/secondary_navigation_elements.scss
浏览文件 @
8a0acaf8
...
...
@@ -31,14 +31,15 @@
color
:
$black
;
}
}
}
&
.active
{
color
:
$black
;
font-weight
:
$gl-font-weight-bold
;
&
.active
a
,
a
.active
{
color
:
$black
;
font-weight
:
$gl-font-weight-bold
;
.badge.badge-pill
{
color
:
$black
;
}
.badge.badge-pill
{
color
:
$black
;
}
}
}
...
...
app/views/shared/milestones/_tabs.html.haml
浏览文件 @
8a0acaf8
...
...
@@ -5,25 +5,25 @@
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs.js-milestone-tabs.nav.nav-tabs
-
if
issues_accessible
%li
.
active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
,
'data-show'
=>
'.tab-issues-buttons'
do
%li
.
nav-item
=
link_to
'#tab-issues'
,
class:
'nav-link active'
,
'data-toggle'
=>
'tab'
,
'data-show'
=>
'.tab-issues-buttons'
do
Issues
%span
.badge.badge-pill
=
milestone
.
issues_visible_to_user
(
current_user
).
size
%li
=
link_to
'#tab-merge-requests'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_merge_request_tab_path
(
milestone
)
do
%li
.nav-item
=
link_to
'#tab-merge-requests'
,
class:
'nav-link'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_merge_request_tab_path
(
milestone
)
do
Merge Requests
%span
.badge.badge-pill
=
milestone
.
merge_requests
.
size
-
else
%li
.
active
=
link_to
'#tab-merge-requests'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_merge_request_tab_path
(
milestone
)
do
%li
.
nav-item
=
link_to
'#tab-merge-requests'
,
class:
'nav-link active'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_merge_request_tab_path
(
milestone
)
do
Merge Requests
%span
.badge.badge-pill
=
milestone
.
merge_requests
.
size
%li
=
link_to
'#tab-participants'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_participants_tab_path
(
milestone
)
do
%li
.nav-item
=
link_to
'#tab-participants'
,
class:
'nav-link'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_participants_tab_path
(
milestone
)
do
Participants
%span
.badge.badge-pill
=
milestone
.
participants
.
count
%li
=
link_to
'#tab-labels'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_labels_tab_path
(
milestone
)
do
%li
.nav-item
=
link_to
'#tab-labels'
,
class:
'nav-link'
,
'data-toggle'
=>
'tab'
,
'data-endpoint'
:
milestone_labels_tab_path
(
milestone
)
do
Labels
%span
.badge.badge-pill
=
milestone
.
labels
.
count
...
...
spec/features/projects/milestones/milestone_spec.rb
浏览文件 @
8a0acaf8
...
...
@@ -17,8 +17,8 @@ feature 'Project milestone' do
it
'shows issues tab'
do
within
(
'#content-body'
)
do
expect
(
page
).
to
have_link
'Issues'
,
href:
'#tab-issues'
expect
(
page
).
to
have_selector
'.nav-links li.active'
,
count:
1
expect
(
find
(
'.nav-links li.active'
)).
to
have_content
'Issues'
expect
(
page
).
to
have_selector
'.nav-links li
a
.active'
,
count:
1
expect
(
find
(
'.nav-links li
a
.active'
)).
to
have_content
'Issues'
end
end
...
...
@@ -44,8 +44,8 @@ feature 'Project milestone' do
it
'hides issues tab'
do
within
(
'#content-body'
)
do
expect
(
page
).
not_to
have_link
'Issues'
,
href:
'#tab-issues'
expect
(
page
).
to
have_selector
'.nav-links li.active'
,
count:
1
expect
(
find
(
'.nav-links li.active'
)).
to
have_content
'Merge Requests'
expect
(
page
).
to
have_selector
'.nav-links li
a
.active'
,
count:
1
expect
(
find
(
'.nav-links li
a
.active'
)).
to
have_content
'Merge Requests'
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录