summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-04-02 22:37:04 +0000
committerMike Greiling <mike@pixelcog.com>2019-04-02 22:37:04 +0000
commit645303c7e71d554c3ee1a338730d8b779c47acc1 (patch)
tree893ed856df46a77b6b3ca9773e30cf3b726a8e38
parent4ab132e9bb6c6daedbb2937a83f4d5bd8c3ede18 (diff)
parent2614273328972243a0d18b1fca92265946e68c03 (diff)
downloadgitlab-ce-645303c7e71d554c3ee1a338730d8b779c47acc1.tar.gz
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
-rw-r--r--app/assets/stylesheets/framework/system_messages.scss1
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--changelogs/unreleased/59131-set-the-size-of-instance-system-message-text-12px.yml5
3 files changed, 6 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;
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