From d14e16526e16367aa744d17d683f738194ff9695 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray <annabel.dunstone@gmail.com> Date: Thu, 30 Aug 2018 09:31:32 -0500 Subject: [PATCH] Increase padding in markdown code blocks --- app/assets/stylesheets/framework/typography.scss | 2 +- app/assets/stylesheets/framework/variables.scss | 1 + app/assets/stylesheets/pages/diff.scss | 4 ---- changelogs/unreleased/update-padding-markdown.yml | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/unreleased/update-padding-markdown.yml diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 5c6110737a4..9929f1bdebf 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -327,7 +327,7 @@ h6 { pre { font-family: $monospace-font; display: block; - padding: $gl-padding-8; + padding: $gl-padding-8 $input-horizontal-padding; margin: 0 0 $gl-padding-8; font-size: 13px; word-break: break-all; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 2781d910b8d..d76f5cbd9ff 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -236,6 +236,7 @@ $gl-vert-padding: 6px; $gl-padding-top: 10px; $gl-sidebar-padding: 22px; $gl-bar-padding: 3px; +$input-horizontal-padding: 12px; /* * Misc diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index a999a70693e..7d7143631f2 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -25,10 +25,6 @@ color: $gl-text-color; border-radius: 0 0 3px 3px; - .code { - padding: 0; - } - .unfold { cursor: pointer; } diff --git a/changelogs/unreleased/update-padding-markdown.yml b/changelogs/unreleased/update-padding-markdown.yml new file mode 100644 index 00000000000..51037200bd1 --- /dev/null +++ b/changelogs/unreleased/update-padding-markdown.yml @@ -0,0 +1,5 @@ +--- +title: Increase padding in code blocks +merge_request: +author: +type: fixed -- 2.30.9