summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorMartin Wortschack <mwortschack@gitlab.com>2018-08-17 17:54:40 +0200
committerMartin Wortschack <mwortschack@gitlab.com>2018-08-17 17:55:44 +0200
commit17697e90a2ae981fdc3829510186e429d30a7b22 (patch)
tree625be41df0f6f52a5dfe963bcca069fae2c2ba95 /app/assets/stylesheets
parent46494f46a1345bafed1cde91ccfa4fb585a1782f (diff)
downloadgitlab-ce-17697e90a2ae981fdc3829510186e429d30a7b22.tar.gz
keeps margin for user status emojis consistent
- adds extra margin to the user-status-emoji - removes whitespaces from the issable_meta helper
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/issuable.scss9
-rw-r--r--app/assets/stylesheets/pages/members.scss9
-rw-r--r--app/assets/stylesheets/pages/notes.scss9
3 files changed, 27 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d16a63d009a..cc10d305b40 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -701,6 +701,15 @@
align-self: center;
overflow: hidden;
text-overflow: ellipsis;
+
+ .user-status-emoji {
+ margin: 0 8px 0 4px;
+
+ gl-emoji {
+ font-size: 1em;
+ line-height: 1;
+ }
+ }
}
.js-issuable-selector-wrap {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 5fdb2b4a90a..1fd725ee589 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -195,6 +195,15 @@
word-break: break-all;
}
+ .user-status-emoji {
+ margin-right: 4px;
+
+ gl-emoji {
+ font-size: 1em;
+ line-height: 1;
+ }
+ }
+
.member-group-link {
display: inline-block;
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 2e1b2126887..9a9977d43ac 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -421,6 +421,15 @@ ul.notes {
&.discussion {
padding-bottom: 0;
}
+
+ .user-status-emoji {
+ margin-right: 4px;
+
+ gl-emoji {
+ font-size: 1em;
+ line-height: 1;
+ }
+ }
}
.system-note .note-header-info {