summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-16 15:12:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-16 15:12:13 +0000
commit5bf3906a4824c774a565285a89f68a4b70968885 (patch)
treef98c928b05191c5ae3b841f0263ddaee8241a1db
parentf0bfbd72bcc4b9b648311e445047107576d04f80 (diff)
parent46d748dc2e7329fede6fd2c20038e98100b90fec (diff)
downloadgitlab-ce-5bf3906a4824c774a565285a89f68a4b70968885.tar.gz
Merge branch 'comment-highlight' into 'master'
Highlight comment based on anchor in URL Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fix for #2954 See merge request !1618
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/framework/timeline.scss4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ea9f55ad08e..57768d6b3eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.2.0 (unreleased)
- Show last project commit to default branch on project home page
+ - Highlight comment based on anchor in URL
v 8.1.0 (unreleased)
- Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index bf21d7fce76..9d6f053aefe 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -13,6 +13,10 @@
border-bottom: 1px solid #ECEEF1;
border-right: 1px solid #ECEEF1;
+ &:target {
+ background: $hover;
+ }
+
&:last-child {
border-bottom: none;
}