summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-02-21 15:54:09 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-02-21 15:54:09 +0000
commit7732542c9205cc3ba08474ac58b7c3a18bfebdc1 (patch)
tree2db7e441bc3b3ebbd8e7c4ff53ef96fb19ce0952
parent0a5238204a51cc2e17019339d0da577feb29dff0 (diff)
parentc2440a9b8c7a4eec9dffeaae4b10d50cff907e6a (diff)
downloadgitlab-ce-7732542c9205cc3ba08474ac58b7c3a18bfebdc1.tar.gz
Merge branch '35418-remove-underline-for-avatar' into 'master'
Resolve "Remove underline for avatar" Closes #35418 See merge request gitlab-org/gitlab-ce!17219
-rw-r--r--app/assets/stylesheets/pages/milestone.scss4
-rw-r--r--app/views/shared/milestones/_issuable.html.haml2
-rw-r--r--changelogs/unreleased/35418-remove-underline-for-avatar.yml5
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index ae8fa45a2d7..e5afa8fffcb 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -115,6 +115,10 @@
display: block;
margin-top: 7px;
+ .issue-link {
+ display: inline-block;
+ }
+
.issuable-number {
color: $gl-text-color-secondary;
margin-right: 5px;
diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml
index 479b7270b28..129f6ab604e 100644
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@@ -17,7 +17,7 @@
= confidential_icon(issuable)
= link_to issuable.title, issuable_url_args, title: issuable.title
.issuable-detail
- = link_to [namespace, project, issuable] do
+ = link_to [namespace, project, issuable], class: 'issue-link' do
%span.issuable-number= issuable.to_reference
- labels.each do |label|
diff --git a/changelogs/unreleased/35418-remove-underline-for-avatar.yml b/changelogs/unreleased/35418-remove-underline-for-avatar.yml
new file mode 100644
index 00000000000..034365e1137
--- /dev/null
+++ b/changelogs/unreleased/35418-remove-underline-for-avatar.yml
@@ -0,0 +1,5 @@
+---
+title: remove avater underline
+merge_request: 17219
+author: Ken Ding
+type: fixed