summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-17 23:41:11 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-17 23:41:11 +0000
commitf04b2b91e6dfab005e59562f196546fd2930d0c6 (patch)
tree8b7b1454450301b2895e2b1e2a89d9fb4cd9a7d3
parent6fc516822c18be65b1cad4ddde54bf7bcb97f487 (diff)
parentfe2a14136b5978823ebd024141a00a236fedddd0 (diff)
downloadgitlab-ce-f04b2b91e6dfab005e59562f196546fd2930d0c6.tar.gz
Merge branch 'file-content-large-screen-padding' into 'master'
Double padding for file-content wiki class on larger screens See merge request gitlab-org/gitlab-ce!16534
-rw-r--r--app/assets/stylesheets/framework/files.scss4
-rw-r--r--changelogs/unreleased/file-content-large-screen-padding.yml5
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 1e91db5af9b..d835d49d8b2 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -124,6 +124,10 @@
&.wiki {
padding: $gl-padding;
+
+ @media (min-width: $screen-md-min) {
+ padding: $gl-padding * 2;
+ }
}
&.blob-no-preview {
diff --git a/changelogs/unreleased/file-content-large-screen-padding.yml b/changelogs/unreleased/file-content-large-screen-padding.yml
new file mode 100644
index 00000000000..5691cd09b1f
--- /dev/null
+++ b/changelogs/unreleased/file-content-large-screen-padding.yml
@@ -0,0 +1,5 @@
+---
+title: Double padding for file-content wiki class on larger screens
+merge_request:
+author:
+type: changed