summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitrieh <dimitriehoekstra@gmail.com>2017-01-05 00:51:09 +0100
committerdimitrieh <dimitriehoekstra@gmail.com>2017-01-05 00:51:09 +0100
commitc1daa7d177eef223cb54c4185343f0fb9a1c04e2 (patch)
tree839dbc3e57498148bf9745cdce53a7ac724a9ea4
parentce8eb711fc9593230816f79adc5c91438224104f (diff)
downloadgitlab-ce-c1daa7d177eef223cb54c4185343f0fb9a1c04e2.tar.gz
added the same to .header-user-avatar to make it consistent
-rw-r--r--app/assets/stylesheets/framework/animations.scss3
-rw-r--r--app/assets/stylesheets/framework/header.scss9
2 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index 3ff76e248b4..8d38fc78a19 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -100,7 +100,8 @@
}
.dropdown-menu-toggle,
-.avatar-circle {
+.avatar-circle,
+.header-user-avatar {
@include transition(border-color);
}
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 09e7db80914..2ff020ab357 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -57,6 +57,14 @@ header {
&.header-user-dropdown-toggle {
margin-left: 14px;
+
+ &:hover,
+ &:focus,
+ &:active {
+ .header-user-avatar {
+ border-color: rgba($avatar-border, .2);
+ }
+ }
}
&:hover,
@@ -273,4 +281,5 @@ header {
float: left;
margin-right: 5px;
border-radius: 50%;
+ border: 1px solid $avatar-border;
}