From 65ede29537573836b8958be3feb6abfde163f0fc Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Tue, 2 Apr 2019 12:49:13 +0000 Subject: Update system message banner font size to 12px --- app/assets/stylesheets/framework/system_messages.scss | 1 + .../59131-set-the-size-of-instance-system-message-text-12px.yml | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 changelogs/unreleased/59131-set-the-size-of-instance-system-message-text-12px.yml 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/changelogs/unreleased/59131-set-the-size-of-instance-system-message-text-12px.yml b/changelogs/unreleased/59131-set-the-size-of-instance-system-message-text-12px.yml new file mode 100644 index 00000000000..688190f4458 --- /dev/null +++ b/changelogs/unreleased/59131-set-the-size-of-instance-system-message-text-12px.yml @@ -0,0 +1,5 @@ +--- +title: Update system message banner font size to 12px +merge_request: 26293 +author: +type: changed -- cgit v1.2.1 From 2614273328972243a0d18b1fca92265946e68c03 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Tue, 2 Apr 2019 12:49:36 +0000 Subject: Remove duplicate declaration of $system-header-height --- app/assets/stylesheets/framework/variables.scss | 1 - 1 file changed, 1 deletion(-) 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; -- cgit v1.2.1