summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-25 08:36:12 +0000
committerPhil Hughes <me@iamphill.com>2019-03-25 08:36:12 +0000
commite393fbc2e83ac674af5c0b9a751ca030572c4452 (patch)
tree67c50cba000730ec143192bab318f022faabec49
parentb54b22cdf258f5cb9f3aefd857cec6c514d4b5ab (diff)
parent43a08e1e58aa850541d2e91fc91e073805280043 (diff)
downloadgitlab-ce-e393fbc2e83ac674af5c0b9a751ca030572c4452.tar.gz
Merge branch '10538-avatar-css' into 'master'
removes ee differences for avatar.scss Closes gitlab-ee#10538 See merge request gitlab-org/gitlab-ce!26360
-rw-r--r--app/assets/stylesheets/framework/avatar.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index af79a4d9392..37a729c7a63 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -61,6 +61,10 @@
border: 0;
}
+ &.avatar-placeholder {
+ border: 0;
+ }
+
&:not([href]):hover {
border-color: darken($gray-normal, 10%);
}