summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-05-30 13:42:06 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-05-31 19:34:26 -0500
commitcc8e7ea2056ae8132ea9eb0565c8e0a07b1077a6 (patch)
tree3618f91ca3051dfa3bfc745737f1a88cd5249325 /app/assets
parentb9798c157ac5973e9dd2b7ad95267014034a219f (diff)
downloadgitlab-ce-cc8e7ea2056ae8132ea9eb0565c8e0a07b1077a6.tar.gz
Remove unused avatar sizes62429-remove-unused-avatar-sizes
- Update avatars to use only sizes from the 8px grid
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/diffs/components/commit_item.vue2
-rw-r--r--app/assets/stylesheets/components/avatar.scss34
-rw-r--r--app/assets/stylesheets/pages/commits.scss2
3 files changed, 3 insertions, 35 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index a767379d662..bd7259ce3ee 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -69,7 +69,7 @@ export default {
:link-href="authorUrl"
:img-src="authorAvatar"
:img-alt="authorName"
- :img-size="36"
+ :img-size="40"
class="avatar-cell d-none d-sm-block"
/>
<div class="commit-detail flex-list">
diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss
index 25ee3ca944d..1afa5ed90f4 100644
--- a/app/assets/stylesheets/components/avatar.scss
+++ b/app/assets/stylesheets/components/avatar.scss
@@ -7,9 +7,6 @@ $avatar-sizes: (
18: (
border-radius: $border-radius-small
),
- 19: (
- border-radius: $border-radius-small
- ),
20: (
border-radius: $border-radius-small
),
@@ -28,17 +25,11 @@ $avatar-sizes: (
line-height: 32px,
border-radius: $border-radius-default
),
- 36: (
- border-radius: $border-radius-default
- ),
40: (
font-size: 16px,
line-height: 38px,
border-radius: $border-radius-default
),
- 46: (
- border-radius: $border-radius-default
- ),
48: (
font-size: 20px,
line-height: 48px,
@@ -54,37 +45,16 @@ $avatar-sizes: (
line-height: 64px,
border-radius: $border-radius-large
),
- 70: (
- font-size: 34px,
- line-height: 70px,
- border-radius: $border-radius-large
- ),
90: (
font-size: 36px,
line-height: 88px,
border-radius: $border-radius-large
),
- 96: (
- font-size: 48px,
- line-height: 96px,
- border-radius: $border-radius-large
- ),
100: (
font-size: 36px,
line-height: 98px,
border-radius: $border-radius-large
),
- 110: (
- font-size: 40px,
- line-height: 108px,
- font-weight: $gl-font-weight-normal,
- border-radius: $border-radius-large
- ),
- 140: (
- font-size: 72px,
- line-height: 138px,
- border-radius: $border-radius-large
- ),
160: (
font-size: 96px,
line-height: 158px,
@@ -97,13 +67,13 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
.avatar-circle {
float: left;
- margin-right: 15px;
+ margin-right: $gl-padding;
border-radius: $avatar-radius;
border: 1px solid $gray-normal;
@each $size, $size-config in $avatar-sizes {
&.s#{$size} {
- @include avatar-size(#{$size}px, if($size < 36, 8px, 16px));
+ @include avatar-size(#{$size}px, if($size < 48, 8px, 16px));
}
}
}
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 66cd113db84..77a36e59b03 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -154,8 +154,6 @@
}
.avatar-cell {
- width: 46px;
-
img {
margin-right: 0;
}