Commit f4a50318 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents ab1371f7 1614089f
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
p { p {
@include str-truncated(100%); @include str-truncated(100%);
margin-top: 0; margin-top: -1px;
margin-bottom: 0; margin-bottom: 0;
} }
} }
......
...@@ -278,7 +278,7 @@ $general-hover-transition-duration: 100ms; ...@@ -278,7 +278,7 @@ $general-hover-transition-duration: 100ms;
$general-hover-transition-curve: linear; $general-hover-transition-curve: linear;
$highlight-changes-color: rgb(235, 255, 232); $highlight-changes-color: rgb(235, 255, 232);
$performance-bar-height: 35px; $performance-bar-height: 35px;
$system-header-height: 35px; $system-header-height: 16px;
$system-footer-height: $system-header-height; $system-footer-height: $system-header-height;
$flash-height: 52px; $flash-height: 52px;
$context-header-height: 60px; $context-header-height: 60px;
......
---
title: Reduce height of instance system header and footer
merge_request: 25752
author:
type: changed
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