Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0bfb7124
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,发现更多精彩内容 >>
提交
0bfb7124
编写于
2月 25, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Created helper class to hide content in issue sidebar when collapsed
Closes #13764
上级
856153d7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
26 deletion
+19
-26
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-8
app/views/shared/issuable/_participants.html.haml
app/views/shared/issuable/_participants.html.haml
+3
-2
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+15
-16
未找到文件。
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
0bfb7124
...
...
@@ -203,14 +203,7 @@
overflow
:
hidden
;
}
.issuable-count
,
.issuable-nav
,
.assignee
>
*,
.milestone
>
*,
.labels
>
*,
.participants
>
*,
.light
>
*,
.project-reference
>
*
{
.hide-collapsed
{
display
:
none
;
}
...
...
app/views/shared/issuable/_participants.html.haml
浏览文件 @
0bfb7124
...
...
@@ -3,7 +3,8 @@
=
icon
(
'users'
)
%span
=
participants
.
count
.title
.title
.hide-collapsed
=
pluralize
participants
.
count
,
"participant"
-
participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
%span
.hide-collapsed
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
app/views/shared/issuable/_sidebar.html.haml
浏览文件 @
0bfb7124
%aside
.right-sidebar
{
class:
sidebar_gutter_collapsed_class
}
.issuable-sidebar
.block
%span
.issuable-count.pull-left
%span
.issuable-count.
hide-collapsed.
pull-left
=
issuable
.
iid
of
=
issuables_count
(
issuable
)
%span
.pull-right
%a
.gutter-toggle
{
href:
'#'
}
=
sidebar_gutter_toggle_icon
.issuable-nav.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
.issuable-nav.
hide-collapsed.
pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
-
if
prev_issuable
=
prev_issuable_for
(
issuable
)
=
link_to
'Prev'
,
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
prev_issuable
],
class:
'btn btn-default prev-btn'
-
else
...
...
@@ -27,13 +27,13 @@
=
link_to_member_avatar
(
issuable
.
assignee
,
size:
24
)
-
else
=
icon
(
'user'
)
.title
.title
.hide-collapsed
%label
Assignee
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value
.value
.hide-collapsed
-
if
issuable
.
assignee
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
if
issuable
.
instance_of?
(
MergeRequest
)
&&
!
issuable
.
can_be_merged_by?
(
issuable
.
assignee
)
...
...
@@ -42,7 +42,7 @@
-
else
.light
None
.selectbox
.selectbox
.hide-collapsed
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
,
first_user:
true
)
.block.milestone
...
...
@@ -53,13 +53,13 @@
=
issuable
.
milestone
.
title
-
else
No
.title
.title
.hide-collapsed
%label
Milestone
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value
.value
.hide-collapsed
-
if
issuable
.
milestone
%span
.back-to-milestone
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
issuable
.
milestone
)
do
...
...
@@ -68,7 +68,7 @@
=
issuable
.
milestone
.
title
-
else
.light
None
.selectbox
.selectbox
.hide-collapsed
=
f
.
select
(
:milestone_id
,
milestone_options
(
issuable
),
{
include_blank:
true
},
{
class:
'select2 select2-compact js-select2 js-milestone'
,
data:
{
placeholder:
'Select milestone'
}})
=
hidden_field_tag
:issuable_context
=
f
.
submit
class:
'btn hide'
...
...
@@ -79,18 +79,18 @@
=
icon
(
'tags'
)
%span
=
issuable
.
labels
.
count
.title
.title
.hide-collapsed
%label
Labels
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value.issuable-show-labels
.value.issuable-show-labels
.hide-collapsed
-
if
issuable
.
labels
.
any?
-
issuable
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
type:
issuable
.
to_ability_name
)
-
else
.light
None
.selectbox
.selectbox
.hide-collapsed
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2 js-select2'
,
data:
{
placeholder:
"Select labels"
}
...
...
@@ -101,12 +101,12 @@
.block.light
.sidebar-collapsed-icon
=
icon
(
'rss'
)
.title
.title
.hide-collapsed
%label
.light
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
%button
.btn.btn-block.btn-gray.subscribe-button
{
:type
=>
'button'
}
%button
.btn.btn-block.btn-gray.subscribe-button
.hide-collapsed
{
:type
=>
'button'
}
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
.subscription-status
{
data:
{
status:
subscribtion_status
}}
.subscription-status
.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
You're not receiving notifications from this thread.
.subscribed
{
class:
(
'hidden'
unless
subscribed
)}
...
...
@@ -116,8 +116,7 @@
.block.project-reference
.sidebar-collapsed-icon
=
clipboard_button
(
clipboard_text:
project_ref
)
.title
.cross-project-reference
.cross-project-reference.hide-collapsed
%span
Reference:
%cite
{
title:
project_ref
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录