diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-18 21:32:16 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-18 21:32:16 +0000 |
| commit | 3786c4d3bdd78250cdd5d56e6add24808fd9ced7 (patch) | |
| tree | bbf51d3bd2417fe3aca8f448bbdbe4ae49581462 | |
| parent | 651bf36cc5d485a7c136f93b21b97bc807dd2188 (diff) | |
| parent | a80583a9d24d0ecd08d91dbfcb5198f7becca02c (diff) | |
| download | gitlab-ce-3786c4d3bdd78250cdd5d56e6add24808fd9ced7.tar.gz | |
Merge branch '32561-opaque-avatar-border-ee-backport' into 'master'
Update avatar border to be opaque for better stacking -- EE backport
Closes #32561
See merge request !12940
| -rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index 4ae2b164d2e..06f7af33f94 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -60,7 +60,7 @@ } &:not([href]):hover { - border-color: rgba($avatar-border, .2); + border-color: darken($avatar-border, 10%); } } @@ -99,7 +99,7 @@ .avatar-counter { background-color: $gray-darkest; color: $white-light; - border: 1px solid $border-color; + border: 1px solid $avatar-border; border-radius: 1em; font-family: $regular_font; font-size: 9px; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 8bd69faf84c..7016208f624 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -379,7 +379,7 @@ $issue-boards-card-shadow: rgba(186, 186, 186, 0.5); * Avatar */ $avatar_radius: 50%; -$avatar-border: rgba(0, 0, 0, .1); +$avatar-border: $border-color; $gl-avatar-size: 40px; /* diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index e858ef427b0..aa04e490649 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -346,13 +346,9 @@ display: none; } - .avatar:hover, - .avatar-counter:hover { - border-color: $issuable-sidebar-color; - } - .avatar-counter:hover { color: $issuable-sidebar-color; + border-color: $issuable-sidebar-color; } .btn-clipboard { |