Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d6b2c870
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,发现更多精彩内容 >>
提交
d6b2c870
编写于
7月 26, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
style updates
fixed weird dropdown items in issues when on merge request page
上级
80b55398
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
37 deletion
+32
-37
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+16
-12
app/views/layouts/nav/_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+16
-25
未找到文件。
app/assets/stylesheets/new_sidebar.scss
浏览文件 @
d6b2c870
...
...
@@ -195,6 +195,7 @@ $new-sidebar-width: 220px;
>
li
{
>
a
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-left
:
4px
;
margin-right
:
2px
;
}
}
...
...
@@ -204,10 +205,13 @@ $new-sidebar-width: 220px;
@media
(
min-width
:
$screen-sm-min
)
{
position
:
fixed
;
top
:
0
;
left
:
2
20
px
;
left
:
2
19
px
;
width
:
150px
;
background-color
:
$hover-background
;
margin-top
:
-1px
;
padding
:
1px
;
background-color
:
$white-light
;
box-shadow
:
2px
1px
3px
$dropdown-shadow-color
;
border
:
1px
solid
$gray-darker
;
border-radius
:
0
3px
3px
0
;
&
::before
{
...
...
@@ -233,19 +237,20 @@ $new-sidebar-width: 220px;
transform
:
skew
(
33deg
);
}
&
.is-above
::after
{
top
:
auto
;
bottom
:
44px
;
transform
:
skew
(
-30deg
);
&
.is-above
{
margin-top
:
1px
;
&
::after
{
top
:
auto
;
bottom
:
44px
;
transform
:
skew
(
-30deg
);
}
}
a
{
color
:
rgba
(
$white-light
,
.9
);
&
:hover
,
&
:focus
{
color
:
$white-light
;
background-color
:
rgba
(
$black
,
.12
);
background-color
:
$gray-darker
;
}
}
}
...
...
@@ -273,8 +278,7 @@ $new-sidebar-width: 220px;
&
:not
(
.active
)
:hover
>
a
,
>
a
:hover
{
background-color
:
$hover-background
;
color
:
$hover-color
;
background-color
:
$white-light
;
.badge
{
background-color
:
$indigo-500
;
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
浏览文件 @
d6b2c870
...
...
@@ -83,34 +83,25 @@
Issues
%ul
.sidebar-sub-level-items
-
if
project_nav_tab?
(
:issues
)
&&
!
current_controller?
(
:merge_requests
)
=
nav_link
(
controller: :issues
)
do
=
link_to
project_issues_path
(
@project
),
title:
'Issues'
do
%span
List
=
nav_link
(
controller: :boards
)
do
=
link_to
project_boards_path
(
@project
),
title:
'Board'
do
%span
Board
=
nav_link
(
controller: :issues
)
do
=
link_to
project_issues_path
(
@project
),
title:
'Issues'
do
%span
List
-
if
project_nav_tab?
(
:merge_requests
)
&&
current_controller?
(
:merge_requests
)
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
title:
'Merge Requests'
do
%span
Merge Requests
=
nav_link
(
controller: :boards
)
do
=
link_to
project_boards_path
(
@project
),
title:
'Board'
do
%span
Board
-
if
project_nav_tab?
:labels
=
nav_link
(
controller: :labels
)
do
=
link_to
project_labels_path
(
@project
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
controller: :labels
)
do
=
link_to
project_labels_path
(
@project
),
title:
'Labels'
do
%span
Labels
-
if
project_nav_tab?
:milestones
=
nav_link
(
controller: :milestones
)
do
=
link_to
project_milestones_path
(
@project
),
title:
'Milestones'
do
%span
Milestones
=
nav_link
(
controller: :milestones
)
do
=
link_to
project_milestones_path
(
@project
),
title:
'Milestones'
do
%span
Milestones
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller:
@project
.
default_issues_tracker?
?
:merge_requests
:
[
:merge_requests
,
:labels
,
:milestones
])
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录