Skip to content
Snippets Groups Projects
Commit 541fcc37 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

Add detail to collapsed icons

parent 1bba1558
No related branches found
No related tags found
1 merge request!2645Implement new design for issue and merge request right sidebar
Pipeline #
Loading
@@ -169,10 +169,28 @@
Loading
@@ -169,10 +169,28 @@
   
&.right-sidebar-expanded { &.right-sidebar-expanded {
width: $gutter_width; width: $gutter_width;
hr {
display: none;
}
} }
   
&.right-sidebar-collapsed { &.right-sidebar-collapsed {
width: $sidebar_collapsed_width; 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 { .btn {
Loading
@@ -202,7 +220,12 @@
Loading
@@ -202,7 +220,12 @@
width: 62px; width: 62px;
text-align: center; text-align: center;
margin-left: -19px; margin-left: -19px;
} padding-bottom: 10px;
span {
display: block;
margin-top: 0;
}
} }
   
} }
Loading
Loading
Loading
@@ -20,6 +20,12 @@ module ProjectsHelper
Loading
@@ -20,6 +20,12 @@ module ProjectsHelper
end end
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 = {}) def link_to_member(project, author, opts = {})
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" } default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
opts = default_opts.merge(opts) opts = default_opts.merge(opts)
Loading
Loading
.block.participants .block.participants
.sidebar-collapsed-icon .sidebar-collapsed-icon
= icon('users') = icon('users')
%span
= participants.count
.title .title
= pluralize participants.count, "participant" = pluralize participants.count, "participant"
- participants.each do |participant| - participants.each do |participant|
Loading
Loading
Loading
@@ -26,7 +26,10 @@
Loading
@@ -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| = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
.block.assignee .block.assignee
.sidebar-collapsed-icon .sidebar-collapsed-icon
= icon('user') - if issuable.assignee
= link_to_member_avatar(issuable.assignee, size: 24)
- else
= icon('user')
.title .title
%label %label
Assignee Assignee
Loading
@@ -48,6 +51,11 @@
Loading
@@ -48,6 +51,11 @@
.block.milestone .block.milestone
.sidebar-collapsed-icon .sidebar-collapsed-icon
= icon('balance-scale') = icon('balance-scale')
%span
- if issuable.milestone
= issuable.milestone.title
- else
No
.title .title
%label %label
Milestone Milestone
Loading
@@ -72,6 +80,8 @@
Loading
@@ -72,6 +80,8 @@
.block.labels .block.labels
.sidebar-collapsed-icon .sidebar-collapsed-icon
= icon('tags') = icon('tags')
%span
= issuable.labels.count
.title .title
%label Labels %label Labels
- if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
Loading
@@ -88,7 +98,7 @@
Loading
@@ -88,7 +98,7 @@
{ selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" } { selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" }
   
= render "shared/issuable/participants", participants: issuable.participants(current_user) = render "shared/issuable/participants", participants: issuable.participants(current_user)
%hr
- if current_user - if current_user
- subscribed = issuable.subscribed?(current_user) - subscribed = issuable.subscribed?(current_user)
.block.light .block.light
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment