Commit 0e704781 authored by Andrew Fontaine's avatar Andrew Fontaine

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

Update brand header logo to match tanuki height

See merge request gitlab-org/gitlab!84939
parents 4df3cdf0 0ad35209
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
white-space: nowrap; white-space: nowrap;
img { img {
height: 28px; height: 24px;
+ .logo-text { + .logo-text {
margin-left: 8px; margin-left: 8px;
......
...@@ -808,7 +808,7 @@ input { ...@@ -808,7 +808,7 @@ input {
white-space: nowrap; white-space: nowrap;
} }
.navbar-gitlab .header-content .title img { .navbar-gitlab .header-content .title img {
height: 28px; height: 24px;
} }
.navbar-gitlab .header-content .title img + .logo-text { .navbar-gitlab .header-content .title img + .logo-text {
margin-left: 8px; margin-left: 8px;
......
...@@ -794,7 +794,7 @@ input { ...@@ -794,7 +794,7 @@ input {
white-space: nowrap; white-space: nowrap;
} }
.navbar-gitlab .header-content .title img { .navbar-gitlab .header-content .title img {
height: 28px; height: 24px;
} }
.navbar-gitlab .header-content .title img + .logo-text { .navbar-gitlab .header-content .title img + .logo-text {
margin-left: 8px; margin-left: 8px;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
= f.hidden_field :header_logo_cache = f.hidden_field :header_logo_cache
= f.file_field :header_logo, class: "", accept: 'image/*' = f.file_field :header_logo, class: "", accept: 'image/*'
.form-text.text-muted .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 %hr
.row .row
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
......
...@@ -808,7 +808,7 @@ input { ...@@ -808,7 +808,7 @@ input {
white-space: nowrap; white-space: nowrap;
} }
.navbar-gitlab .header-content .title img { .navbar-gitlab .header-content .title img {
height: 28px; height: 24px;
} }
.navbar-gitlab .header-content .title img + .logo-text { .navbar-gitlab .header-content .title img + .logo-text {
margin-left: 8px; margin-left: 8px;
......
...@@ -794,7 +794,7 @@ input { ...@@ -794,7 +794,7 @@ input {
white-space: nowrap; white-space: nowrap;
} }
.navbar-gitlab .header-content .title img { .navbar-gitlab .header-content .title img {
height: 28px; height: 24px;
} }
.navbar-gitlab .header-content .title img + .logo-text { .navbar-gitlab .header-content .title img + .logo-text {
margin-left: 8px; margin-left: 8px;
......
...@@ -23267,7 +23267,7 @@ msgstr "" ...@@ -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}." msgid "Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}."
msgstr "" 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 "" msgstr ""
msgid "Maximum file size is 1MB. Pages are optimized for a 640x360 px logo." msgid "Maximum file size is 1MB. Pages are optimized for a 640x360 px logo."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment