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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3a57d2a9
Commit
3a57d2a9
authored
Mar 23, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] refactor to use buttons instead of a
parent
0bf1080c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
25 deletions
+29
-25
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/multiple_assignees.js
...ebar_assignees/components/collapsed/multiple_assignees.js
+4
-4
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/single_assignee.js
...sidebar_assignees/components/collapsed/single_assignee.js
+2
-2
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/two_assignees.js
...e_sidebar_assignees/components/collapsed/two_assignees.js
+4
-4
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+19
-15
No files found.
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/multiple_assignees.js
View file @
3a57d2a9
...
...
@@ -29,13 +29,13 @@ export default {
<div class="sidebar-collapsed-icon sidebar-collapsed-user multiple-users"
data-container="body" data-placement="left"
data-toggle="tooltip" title="" :data-original-title="title">
<
a class="author_link" :href="'/' + users[0].username
">
<
button class="btn-link" type="button
">
<img width="24" class="avatar avatar-inline s24 " alt="" :src="users[0].avatarUrl">
<span class="author">{{users[0].name}}</span>
</
a
>
<
a class="author_link" href='#'
>
</
button
>
<
button class="btn-link" type="button"
>
<span class="avatar-counter sidebar-avatar-counter">{{counter}}</span>
</
a
>
</
button
>
</div>
`
,
};
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/single_assignee.js
View file @
3a57d2a9
...
...
@@ -7,10 +7,10 @@ export default {
<div class="sidebar-collapsed-icon sidebar-collapsed-user"
data-container="body" data-placement="left"
data-toggle="tooltip" title="" :data-original-title="users[0].name">
<
a class="author_link" :href="'/' + users[0].username
">
<
button class="btn-link" type="button
">
<img width="24" class="avatar avatar-inline s24 " alt="" :src="users[0].avatarUrl">
<span class="author">{{users[0].name}}</span>
</
a
>
</
button
>
</div>
`
,
};
app/assets/javascripts/vue_sidebar_assignees/components/collapsed/two_assignees.js
View file @
3a57d2a9
...
...
@@ -12,14 +12,14 @@ export default {
<div class="sidebar-collapsed-icon sidebar-collapsed-user multiple-users"
data-container="body" data-placement="left"
data-toggle="tooltip" title="" :data-original-title="title">
<
a class="author_link" :href="'/' + users[0].username
">
<
button class="btn-link" type="button
">
<img width="24" class="avatar avatar-inline s24 " alt="" :src="users[0].avatarUrl">
<span class="author">{{users[0].name}}</span>
</
a
>
<
a class="author_link" :href="'/' + users[1].username
">
</
button
>
<
button class="btn-link" type="button
">
<img width="24" class="avatar avatar-inline s24 " alt="" :src="users[1].avatarUrl">
<span class="author">{{users[1].name}}</span>
</
a
>
</
button
>
</div>
`
,
};
app/assets/stylesheets/pages/issuable.scss
View file @
3a57d2a9
...
...
@@ -332,18 +332,15 @@
&
.multiple-users
{
display
:
flex
;
justify-content
:
center
;
}
}
.sidebar-avatar-counter
{
width
:
2
5
px
;
height
:
2
5
px
;
width
:
2
4
px
;
height
:
2
4
px
;
border-radius
:
12px
;
line-height
:
2
.5em
;
z-index
:
1
;
position
:
relative
;
top
:
-1px
;
left
:
-2px
;
line-height
:
24px
;
}
.sidebar-collapsed-user
{
...
...
@@ -356,19 +353,26 @@
}
.multiple-users
{
.author_link
:first-child
{
z-index
:
2
;
.btn-link
{
padding
:
0
;
border
:
0
;
.avatar
{
margin-left
:
6px
;
margin-right
:
0
;
transform
:
translateX
(
2px
);
margin
:
0
;
}
}
.author_link
.avatar
{
margin-left
:
0
;
transform
:
translateX
(
-2px
);
.btn-link
:first-child
{
z-index
:
1
;
transform
:
translateX
(
3px
);
}
.btn-link
:last-child
{
transform
:
translateX
(
-3px
);
&
:hover
{
text-decoration
:
none
;
}
}
}
}
...
...
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