Add detail to collapsed icons
This commit is contained in:
parent
1bba15589a
commit
541fcc37bf
|
@ -169,10 +169,28 @@
|
|||
|
||||
&.right-sidebar-expanded {
|
||||
width: $gutter_width;
|
||||
|
||||
hr {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
&.right-sidebar-collapsed {
|
||||
width: $sidebar_collapsed_width;
|
||||
padding-top: 0;
|
||||
|
||||
hr {
|
||||
margin: 0;
|
||||
color: $gray-normal;
|
||||
border-color: $gray-normal;
|
||||
width: 62px;
|
||||
margin-left: -20px
|
||||
}
|
||||
|
||||
.block {
|
||||
border-bottom: none;
|
||||
padding: 15px 0 0 0;
|
||||
}
|
||||
}
|
||||
|
||||
.btn {
|
||||
|
@ -202,7 +220,12 @@
|
|||
width: 62px;
|
||||
text-align: center;
|
||||
margin-left: -19px;
|
||||
}
|
||||
padding-bottom: 10px;
|
||||
|
||||
span {
|
||||
display: block;
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -20,6 +20,12 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def link_to_member_avatar(author, opts = {})
|
||||
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
|
||||
opts = default_opts.merge(opts)
|
||||
image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
|
||||
end
|
||||
|
||||
def link_to_member(project, author, opts = {})
|
||||
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
|
||||
opts = default_opts.merge(opts)
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
.block.participants
|
||||
.sidebar-collapsed-icon
|
||||
= icon('users')
|
||||
%span
|
||||
= participants.count
|
||||
.title
|
||||
= pluralize participants.count, "participant"
|
||||
- participants.each do |participant|
|
||||
|
|
|
@ -26,7 +26,10 @@
|
|||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
.block.assignee
|
||||
.sidebar-collapsed-icon
|
||||
= icon('user')
|
||||
- if issuable.assignee
|
||||
= link_to_member_avatar(issuable.assignee, size: 24)
|
||||
- else
|
||||
= icon('user')
|
||||
.title
|
||||
%label
|
||||
Assignee
|
||||
|
@ -48,6 +51,11 @@
|
|||
.block.milestone
|
||||
.sidebar-collapsed-icon
|
||||
= icon('balance-scale')
|
||||
%span
|
||||
- if issuable.milestone
|
||||
= issuable.milestone.title
|
||||
- else
|
||||
No
|
||||
.title
|
||||
%label
|
||||
Milestone
|
||||
|
@ -72,6 +80,8 @@
|
|||
.block.labels
|
||||
.sidebar-collapsed-icon
|
||||
= icon('tags')
|
||||
%span
|
||||
= issuable.labels.count
|
||||
.title
|
||||
%label Labels
|
||||
- if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
|
||||
|
@ -88,7 +98,7 @@
|
|||
{ selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" }
|
||||
|
||||
= render "shared/issuable/participants", participants: issuable.participants(current_user)
|
||||
|
||||
%hr
|
||||
- if current_user
|
||||
- subscribed = issuable.subscribed?(current_user)
|
||||
.block.light
|
||||
|
|
Loading…
Reference in New Issue