summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/framework/emojis.scss10
-rw-r--r--app/assets/stylesheets/pages/issuable.scss5
-rw-r--r--app/assets/stylesheets/pages/members.scss9
-rw-r--r--app/assets/stylesheets/pages/notes.scss9
4 files changed, 10 insertions, 23 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss
index a8ec1e1145a..8bda1c311ee 100644
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
@@ -6,3 +6,13 @@ gl-emoji {
font-size: 1.5em;
line-height: 0.9;
}
+
+.user-status-emoji {
+ margin-right: $gl-padding-4;
+
+ gl-emoji {
+ font-size: 1em;
+ line-height: 16px;
+ vertical-align: baseline;
+ }
+}
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 0a73f0877ff..65dbac0d7aa 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -704,11 +704,6 @@
.user-status-emoji {
margin: 0 $gl-padding-8 0 $gl-padding-4;
-
- gl-emoji {
- font-size: 1em;
- line-height: 16px;
- }
}
}
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index dd332845ea5..5fdb2b4a90a 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -195,15 +195,6 @@
word-break: break-all;
}
- .user-status-emoji {
- margin-right: $gl-padding-4;
-
- gl-emoji {
- font-size: 1em;
- line-height: 16px;
- }
- }
-
.member-group-link {
display: inline-block;
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 3d28adcb156..2e1b2126887 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -421,15 +421,6 @@ ul.notes {
&.discussion {
padding-bottom: 0;
}
-
- .user-status-emoji {
- margin-right: 4px;
-
- gl-emoji {
- font-size: 1em;
- line-height: 16px;
- }
- }
}
.system-note .note-header-info {