Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8bd232d4
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,发现更多精彩内容 >>
提交
8bd232d4
编写于
6月 07, 2017
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fixed-confidential-issue-bar' into 'master'
Add sticky confidential issue bar Closes #29741 See merge request !11952
上级
4cb619fd
3268675a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
42 addition
and
42 deletion
+42
-42
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+31
-0
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+0
-35
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+0
-6
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+7
-1
changelogs/unreleased/fixed-confidential-issue-bar.yml
changelogs/unreleased/fixed-confidential-issue-bar.yml
+4
-0
未找到文件。
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
8bd232d4
...
...
@@ -729,3 +729,34 @@
}
}
}
.confidential-issue-warning
{
background-color
:
$gl-gray
;
border-radius
:
3px
;
padding
:
$gl-btn-padding
$gl-padding
;
margin-top
:
$gl-padding-top
;
font-size
:
14px
;
color
:
$white-light
;
.fa
{
margin-right
:
8px
;
}
a
{
color
:
$white-light
;
text-decoration
:
underline
;
}
&
.affix
{
position
:
static
;
width
:
initial
;
@media
(
min-width
:
$screen-sm-min
)
{
position
:
sticky
;
position
:
-
webkit-sticky
;
top
:
60px
;
z-index
:
200
;
@include
transition
(
all
);
}
}
}
app/assets/stylesheets/pages/note_form.scss
浏览文件 @
8bd232d4
...
...
@@ -103,41 +103,6 @@
}
}
.confidential-issue-warning
{
background-color
:
$gray-normal
;
border-radius
:
3px
;
padding
:
3px
12px
;
margin
:
auto
;
margin-top
:
0
;
text-align
:
center
;
font-size
:
12px
;
align-items
:
center
;
@media
(
max-width
:
$screen-md-max
)
{
// On smaller devices the warning becomes the fourth item in the list,
// rather than centering, and grows to span the full width of the
// comment area.
order
:
4
;
margin
:
6px
auto
;
width
:
100%
;
}
.fa
{
margin-right
:
8px
;
}
}
.right-sidebar-expanded
{
.confidential-issue-warning
{
// When the sidebar is open the warning becomes the fourth item in the list,
// rather than centering, and grows to span the full width of the
// comment area.
order
:
4
;
margin
:
6px
auto
;
width
:
100%
;
}
}
.discussion-form
{
padding
:
$gl-padding-top
$gl-padding
$gl-padding
;
background-color
:
$white-light
;
...
...
app/views/projects/_md_preview.html.haml
浏览文件 @
8bd232d4
...
...
@@ -9,12 +9,6 @@
%li
%a
.js-md-preview-button
{
href:
"#md-preview-holder"
,
tabindex:
-
1
}
Preview
-
if
defined?
(
@issue
)
&&
@issue
.
confidential?
%li
.confidential-issue-warning
=
icon
(
'warning'
)
%span
This is a confidential issue. Your comment will not be visible to the public.
%li
.pull-right
.toolbar-group
=
markdown_toolbar_button
({
icon:
"bold fw"
,
data:
{
"md-tag"
=>
"**"
},
title:
"Add bold text"
})
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
8bd232d4
...
...
@@ -5,6 +5,13 @@
-
can_update_issue
=
can?
(
current_user
,
:update_issue
,
@issue
)
-
can_report_spam
=
@issue
.
submittable_as_spam_by?
(
current_user
)
-
if
defined?
(
@issue
)
&&
@issue
.
confidential?
.confidential-issue-warning
{
data:
{
spy:
'affix'
}
}
%span
.confidential-issue-text
#{
confidential_icon
(
@issue
)
}
This issue is confidential.
%a
{
href:
help_page_path
(
'user/project/issues/confidential_issues'
),
target:
'_blank'
}
What are confidential issues?
.clearfix.detail-page-header
.issuable-header
.issuable-status-box.status-box.status-box-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
...
...
@@ -19,7 +26,6 @@
=
icon
(
'angle-double-left'
)
.issuable-meta
=
confidential_icon
(
@issue
)
=
issuable_meta
(
@issue
,
@project
,
"Issue"
)
.issuable-actions
...
...
changelogs/unreleased/fixed-confidential-issue-bar.yml
0 → 100644
浏览文件 @
8bd232d4
---
title
:
Make confidential issues more obviously confidential
merge_request
:
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录