summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitrieh <dimitriehoekstra@gmail.com>2017-01-05 00:38:54 +0100
committerdimitrieh <dimitriehoekstra@gmail.com>2017-01-05 00:38:54 +0100
commitce8eb711fc9593230816f79adc5c91438224104f (patch)
treee77529b887c4c9e5181406a3251f7d0fcd59ff0f
parent03171bbf20cc40f1b2cdc6f3a6fde35230f920d2 (diff)
downloadgitlab-ce-ce8eb711fc9593230816f79adc5c91438224104f.tar.gz
made avatar border color really subtle and not distracting, plus doesn't act on not links anymore
-rw-r--r--app/assets/stylesheets/framework/avatar.scss8
-rw-r--r--app/assets/stylesheets/pages/issuable.scss6
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 905a61aaee9..8392b98f0a7 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -24,10 +24,6 @@
&.s110 { @include avatar-size(110px, 15px); }
&.s140 { @include avatar-size(140px, 15px); }
&.s160 { @include avatar-size(160px, 20px); }
-
- &:hover {
- border-color: $gl-link-color;
- }
}
.avatar {
@@ -56,6 +52,10 @@
border-radius: 0;
border: none;
}
+
+ &:not([href]):hover {
+ border-color: rgba($avatar-border, .2);
+ }
}
.identicon {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index bc4ac8d2eb4..7b1016ba521 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -99,8 +99,8 @@
.edit-link {
color: $gl-gray;
- &:hover {
- color: $md-link-color;
+ &:not([href]):hover {
+ color: rgba($avatar-border, .2);
}
}
}
@@ -279,7 +279,7 @@
text-decoration: none;
.avatar {
- border-color: $md-link-color;
+ border-color: rgba($avatar-border, .2);
}
}
}