summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitriehoekstra@gmail.com>2017-10-03 12:23:53 +0200
committerDimitrie Hoekstra <dimitriehoekstra@gmail.com>2017-10-04 01:45:19 +0200
commit0a35f057c8dcbd385a8fb1bd3bf2cf0a57f7c176 (patch)
tree93def4a785672398332a1157d9d6f1ed2162d011
parent18dc9f60e8024c2c22293274c35401c92461fce0 (diff)
downloadgitlab-ce-0a35f057c8dcbd385a8fb1bd3bf2cf0a57f7c176.tar.gz
Changed user mention bg and on hover bg to use variables
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 9bbda87dec9..309055be1c2 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -263,6 +263,8 @@ $well-pre-color: #555;
$loading-color: #555;
$update-author-color: #999;
$user-mention-color: #2fa0bb;
+$user-mention-bg: rgba($blue-500, 0.044);
+$user-mention-bg-hover: rgba($blue-500, 0.15);
$time-color: #999;
$project-member-show-color: #aaa;
$gl-promo-color: #aaa;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 059da3c60ea..cd5a50bc55b 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -143,10 +143,10 @@ ul.notes {
.gfm-project_member {
padding: 0 2px;
border-radius: #{$border-radius-default / 2};
- background-color: rgba($blue-500, 0.044);
+ background-color: $user-mention-bg;
&:hover {
- background-color: rgba($blue-500, 0.15);
+ background-color: $user-mention-bg-hover;
text-decoration: none;
}
}