Merge branch '356825-update-custom-logo-size' into 'master'

Update brand header logo to match tanuki height See merge request gitlab-org/gitlab!84939

Merge branch '356825-update-custom-logo-size' into 'master'
Update brand header logo to match tanuki height See merge request gitlab-org/gitlab!84939
0e704781 · Andrew Fontaine · 4df3cdf0 · 0ad35209 · 0e704781 · 0e704781
Commit 0e704781 authored Apr 14, 2022 by Andrew Fontaine
7 changed files
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -52,7 +52,7 @@
      white-space: nowrap;

      img {
-        height: 28px;
+        height: 24px;

        + .logo-text {
          margin-left: 8px;

--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -808,7 +808,7 @@ input {
  white-space: nowrap;
 }
 .navbar-gitlab .header-content .title img {
-  height: 28px;
+  height: 24px;
 }
 .navbar-gitlab .header-content .title img + .logo-text {
  margin-left: 8px;

--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -794,7 +794,7 @@ input {
  white-space: nowrap;
 }
 .navbar-gitlab .header-content .title img {
-  height: 28px;
+  height: 24px;
 }
 .navbar-gitlab .header-content .title img + .logo-text {
  margin-left: 8px;

--- a/app/views/admin/application_settings/appearances/_form.html.haml
+++ b/app/views/admin/application_settings/appearances/_form.html.haml
@@ -21,7 +21,7 @@
          = f.hidden_field :header_logo_cache
          = f.file_field :header_logo, class: "", accept: 'image/*'
          .form-text.text-muted
-            = _('Maximum file size is 1MB. Pages are optimized for a 28px tall header logo')
+            = _('Maximum file size is 1MB. Pages are optimized for a 24px tall header logo')
  %hr
  .row
    .col-lg-4.profile-settings-sidebar

--- a/ee/app/assets/stylesheets/startup/startup-dark.scss
+++ b/ee/app/assets/stylesheets/startup/startup-dark.scss
@@ -808,7 +808,7 @@ input {
  white-space: nowrap;
 }
 .navbar-gitlab .header-content .title img {
-  height: 28px;
+  height: 24px;
 }
 .navbar-gitlab .header-content .title img + .logo-text {
  margin-left: 8px;

--- a/ee/app/assets/stylesheets/startup/startup-general.scss
+++ b/ee/app/assets/stylesheets/startup/startup-general.scss
@@ -794,7 +794,7 @@ input {
  white-space: nowrap;
 }
 .navbar-gitlab .header-content .title img {
-  height: 28px;
+  height: 24px;
 }
 .navbar-gitlab .header-content .title img + .logo-text {
  margin-left: 8px;

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -23267,7 +23267,7 @@ msgstr ""
 msgid "Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}."
 msgstr ""

-msgid "Maximum file size is 1MB. Pages are optimized for a 28px tall header logo"
+msgid "Maximum file size is 1MB. Pages are optimized for a 24px tall header logo"
 msgstr ""

 msgid "Maximum file size is 1MB. Pages are optimized for a 640x360 px logo."