diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-04-03 01:37:04 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-04-03 01:37:04 +0300 |
| commit | 645303c7e71d554c3ee1a338730d8b779c47acc1 (patch) | |
| tree | 893ed856df46a77b6b3ca9773e30cf3b726a8e38 /app/assets | |
| parent | 4ab132e9bb6c6daedbb2937a83f4d5bd8c3ede18 (diff) | |
| parent | 2614273328972243a0d18b1fca92265946e68c03 (diff) | |
Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into 'master'
Resolve "Set the size of instance system message text 12px"
Closes #59131
See merge request gitlab-org/gitlab-ce!26293
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/system_messages.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss index e5edddec71e..6205ccaa52f 100644 --- a/app/assets/stylesheets/framework/system_messages.scss +++ b/app/assets/stylesheets/framework/system_messages.scss @@ -14,6 +14,7 @@ @include str-truncated(100%); margin-top: -1px; margin-bottom: 0; + font-size: $gl-font-size-small; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5d4c84c494d..7d9781ffb87 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -289,7 +289,6 @@ $gl-line-height: 16px; $gl-line-height-24: 24px; $gl-line-height-14: 14px; -$system-header-height: 35px; $issue-box-upcoming-bg: #8f8f8f; $pages-group-name-color: #4c4e54; |