diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-20 08:55:21 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-20 08:55:21 +0000 |
| commit | 1614089fcfe71bd2ff3fafc787195de380b9b6a1 (patch) | |
| tree | cfc753a6a15f73c0976c39aec46ec3ac4522ea7f | |
| parent | 5dc56f83b3b2a774a149dc95774dc439e7ce9586 (diff) | |
| parent | 8c7e666c422c208ebc13e5e0b7d1e33a06193adb (diff) | |
| download | gitlab-ce-1614089fcfe71bd2ff3fafc787195de380b9b6a1.tar.gz | |
Merge branch '58410-change-pixel-size-of-instance-header-footer-message-to-16px' into 'master'
Reduce height of instance system message
Closes #58410
See merge request gitlab-org/gitlab-ce!25752
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss index 3d66136938f..e5edddec71e 100644 --- a/app/assets/stylesheets/framework/system_messages.scss +++ b/app/assets/stylesheets/framework/system_messages.scss @@ -12,7 +12,7 @@ p { @include str-truncated(100%); - margin-top: 0; + margin-top: -1px; margin-bottom: 0; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 0333b9445c5..08dbe3d5b0f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -277,7 +277,7 @@ $general-hover-transition-duration: 100ms; $general-hover-transition-curve: linear; $highlight-changes-color: rgb(235, 255, 232); $performance-bar-height: 35px; -$system-header-height: 35px; +$system-header-height: 16px; $system-footer-height: $system-header-height; $flash-height: 52px; $context-header-height: 60px; diff --git a/changelogs/unreleased/58410-change-pixel-size-of-instance-header-footer-message-to-16px.yml b/changelogs/unreleased/58410-change-pixel-size-of-instance-header-footer-message-to-16px.yml new file mode 100644 index 00000000000..3e494847e75 --- /dev/null +++ b/changelogs/unreleased/58410-change-pixel-size-of-instance-header-footer-message-to-16px.yml @@ -0,0 +1,5 @@ +--- +title: Reduce height of instance system header and footer +merge_request: 25752 +author: +type: changed |