summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/mixins.scss
diff options
context:
space:
mode:
authorRyan Cobb <rcobb@gitlab.com>2019-05-29 10:56:38 -0600
committerRyan Cobb <rcobb@gitlab.com>2019-05-29 10:56:38 -0600
commit0393c5059de2ce03f706fbf28056e1d80304b73a (patch)
treef47c4daaf9315c89cc6b039988d57e1fbd14c322 /app/assets/stylesheets/framework/mixins.scss
parent4fae62b9efa985e4cf6a09cb6bd4b9cf665e6b32 (diff)
parent70d1537dda66da8b319ceefde36195047b26a8fd (diff)
downloadgitlab-ce-0393c5059de2ce03f706fbf28056e1d80304b73a.tar.gz
Merge branch 'master' into 61964-unicorn-instrumentation
Diffstat (limited to 'app/assets/stylesheets/framework/mixins.scss')
-rw-r--r--app/assets/stylesheets/framework/mixins.scss13
1 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 18eb10c1f23..18671f7c4d8 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -325,8 +325,8 @@
line-height: 1;
padding: 0;
min-width: 16px;
- color: $gray-darkest;
- fill: $gray-darkest;
+ color: $gray-600;
+ fill: $gray-600;
.fa {
position: relative;
@@ -376,3 +376,12 @@
}
}
}
+
+/*
+* Mixin that handles the size and right margin of avatars.
+*/
+@mixin avatar-size($size, $margin-right) {
+ width: $size;
+ height: $size;
+ margin-right: $margin-right;
+}