summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjerasmus <jerasmus@gitlab.com>2019-05-17 11:36:30 +0200
committerjerasmus <jerasmus@gitlab.com>2019-05-23 17:21:12 +0200
commit7acf86bdd60d389afffe756b1b2c66755947f403 (patch)
treeaff05c13ffec042735f6313b36445f5a7a634a02
parent671fadf1ab604daa0caf61944a9a152836dffecb (diff)
downloadgitlab-ce-7acf86bdd60d389afffe756b1b2c66755947f403.tar.gz
Move avatar related styles to components directory
Moved all avatar related styles to the components directory
-rw-r--r--app/assets/stylesheets/components/avatar.scss (renamed from app/assets/stylesheets/framework/avatar.scss)6
-rw-r--r--app/assets/stylesheets/framework.scss1
-rw-r--r--app/assets/stylesheets/framework/mixins.scss9
3 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/components/avatar.scss
index 37a729c7a63..0932382064f 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/components/avatar.scss
@@ -1,9 +1,3 @@
-@mixin avatar-size($size, $margin-right) {
- width: $size;
- height: $size;
- margin-right: $margin-right;
-}
-
.avatar-circle {
float: left;
margin-right: 15px;
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index ab9047c54e4..9b0d19b0ef0 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -8,7 +8,6 @@
@import 'framework/animations';
@import 'framework/vue_transitions';
-@import 'framework/avatar';
@import 'framework/asciidoctor';
@import 'framework/banner';
@import 'framework/blocks';
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 97de0c98325..18671f7c4d8 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -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;
+}