Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
541fcc37
Commit
541fcc37
authored
8 years ago
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add detail to collapsed icons
parent
1bba1558
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
3 deletions
+44
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+24
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+6
-0
app/views/shared/issuable/_participants.html.haml
app/views/shared/issuable/_participants.html.haml
+2
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+12
-2
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
541fcc37
...
@@ -169,10 +169,28 @@
...
@@ -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
{
...
@@ -202,7 +220,12 @@
...
@@ -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
;
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/helpers/projects_helper.rb
View file @
541fcc37
...
@@ -20,6 +20,12 @@ module ProjectsHelper
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_participants.html.haml
View file @
541fcc37
.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
|
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_sidebar.html.haml
View file @
541fcc37
...
@@ -26,7 +26,10 @@
...
@@ -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
...
@@ -48,6 +51,11 @@
...
@@ -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
...
@@ -72,6 +80,8 @@
...
@@ -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
)
...
@@ -88,7 +98,7 @@
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment