summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-11 13:40:15 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-11 13:40:15 +0000
commitf737a079cee6689e6ba6c1536f223a882a558f3e (patch)
treef7cbb252529e48b3b77206a845490ec81456e22e
parent2e92c5c458cededd4f51a00b3849bf3cbb326b6b (diff)
parent5b376e654ac656088e0a6e5c3e63c341cac97043 (diff)
downloadgitlab-ce-f737a079cee6689e6ba6c1536f223a882a558f3e.tar.gz
Merge branch '31781-print-rendered-files-not-possible' into 'master'
Include blob content when printing page Closes #31781 See merge request !11247
-rw-r--r--app/assets/stylesheets/print.scss8
-rw-r--r--changelogs/unreleased/31781-print-rendered-files-not-possible.yml4
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss
index 6cc1cc8e263..136d0c79467 100644
--- a/app/assets/stylesheets/print.scss
+++ b/app/assets/stylesheets/print.scss
@@ -28,9 +28,6 @@ nav.navbar-collapse.collapse,
.profiler-results,
.tree-ref-holder,
.tree-holder .breadcrumb,
-.blob-commit-info,
-.file-title,
-.file-holder,
.nav,
.btn,
ul.notes-form,
@@ -43,6 +40,11 @@ ul.notes-form,
display: none!important;
}
+pre {
+ page-break-before: avoid;
+ page-break-inside: auto;
+}
+
.page-gutter {
padding-top: 0;
padding-left: 0;
diff --git a/changelogs/unreleased/31781-print-rendered-files-not-possible.yml b/changelogs/unreleased/31781-print-rendered-files-not-possible.yml
new file mode 100644
index 00000000000..14915823ff7
--- /dev/null
+++ b/changelogs/unreleased/31781-print-rendered-files-not-possible.yml
@@ -0,0 +1,4 @@
+---
+title: Include the blob content when printing a blob page
+merge_request: 11247
+author: