Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 1 deletions

diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index 56ec61ffd84..28c0c071dc0 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -256,6 +256,10 @@
   gl-emoji {
     margin-top: -1px;
     margin-bottom: -1px;
+
+    img {
+      top: 0;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss
index 3b0cacb2350..c7242069cb9 100644
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
@@ -3,10 +3,14 @@ gl-emoji {
   display: inline-flex;
   vertical-align: baseline;
   font-family: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  font-size: 1.2em;
+  line-height: 1;
 
   img {
     width: 1.2em;
     height: 1.2em;
+    position: relative;
+    top: 0.25em;
   }
 }
 
diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml
index 7e38771d81d..2714193d1d1 100644
--- a/app/views/profiles/gpg_keys/index.html.haml
+++ b/app/views/profiles/gpg_keys/index.html.haml
@@ -22,7 +22,7 @@
           = @gpg_keys.count
       .gl-new-card-actions
         = render Pajamas::ButtonComponent.new(size: :small, button_options: { class: "js-toggle-button js-toggle-content #{hide_class}" }) do
-          = _('Add a GPG key')
+          = _('Add new key')
     - c.with_body do
       .gl-new-card-add-form.gl-m-3.js-toggle-content{ class: add_form_class }
         %h4.gl-mt-0