diff --git a/frappe/core/doctype/print_settings/print_settings.json b/frappe/core/doctype/print_settings/print_settings.json index 4299d79e17..87daa526cf 100644 --- a/frappe/core/doctype/print_settings/print_settings.json +++ b/frappe/core/doctype/print_settings/print_settings.json @@ -38,7 +38,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Print Style", - "options": "Modern\nClassic\nStandard", + "options": "Modern\nClassic\nStandard\nMonochrome", "permlevel": 0 }, { @@ -76,7 +76,7 @@ ], "icon": "icon-cog", "issingle": 1, - "modified": "2014-07-31 07:43:54.550258", + "modified": "2014-08-05 09:03:02.337355", "modified_by": "Administrator", "module": "Core", "name": "Print Settings", diff --git a/frappe/public/css/print.css b/frappe/public/css/print.css deleted file mode 100644 index f15f4454f4..0000000000 --- a/frappe/public/css/print.css +++ /dev/null @@ -1,84 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,700); - -@media screen { - .print-format-gutter { - background-color: #ddd; - padding: 15px 0px; - } - .print-format { - background-color: white; - box-shadow: 0px 0px 9px rgba(0,0,0,0.5); - max-width: 8.3in; - min-height: 11.69in; - padding: 0.75in; - margin: auto; - } - - .page-break { - padding: 30px 0px; - border-bottom: 1px dashed #888; - } - - .page-break:first-child { - padding-top: 0px; - } - - .page-break:last-child { - border-bottom: 0px; - } -} - -@media print { - .print-format p { - margin-left: 1px; - margin-right: 1px; - } -} - -.print-format { - font-size: 9pt; - font-family: 'Noto Sans', sans-serif; - -webkit-print-color-adjust:exact; -} - -.page-break { - page-break-after: always; -} - -.print-heading { - border-bottom: 2px solid #aaa; - margin-bottom: 10px; -} - -.print-heading h2 { - margin: 0px; -} -.print-heading h4 { - margin-top: 5px; -} - -table.no-border, table.no-border td { - border: 0px; -} - -.print-format label { - /* wkhtmltopdf breaks label into multiple lines when it is inline-block */ - display: block; -} - -.print-format img { - max-width: 100%; -} - -.print-format table td > .primary:first-child { - font-weight: bold; -} - -.print-format td, .print-format th { - vertical-align: top !important; - padding: 6px !important; -} - -.print-format p { - margin: 3px 0px 3px; -} diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html index 4f08d35316..740261397a 100644 --- a/frappe/public/html/print_template.html +++ b/frappe/public/html/print_template.html @@ -8,7 +8,9 @@ {%= title %} - +
diff --git a/frappe/public/images/help/print-style-classic.png b/frappe/public/images/help/print-style-classic.png index 6a2012e663..e1817aad28 100644 Binary files a/frappe/public/images/help/print-style-classic.png and b/frappe/public/images/help/print-style-classic.png differ diff --git a/frappe/public/images/help/print-style-modern.png b/frappe/public/images/help/print-style-modern.png index 591b56e901..57917de063 100644 Binary files a/frappe/public/images/help/print-style-modern.png and b/frappe/public/images/help/print-style-modern.png differ diff --git a/frappe/public/images/help/print-style-monochrome.png b/frappe/public/images/help/print-style-monochrome.png new file mode 100644 index 0000000000..ed0a301deb Binary files /dev/null and b/frappe/public/images/help/print-style-monochrome.png differ diff --git a/frappe/public/images/help/print-style-standard.png b/frappe/public/images/help/print-style-standard.png index 9236584007..db1c37044e 100644 Binary files a/frappe/public/images/help/print-style-standard.png and b/frappe/public/images/help/print-style-standard.png differ diff --git a/frappe/templates/pages/print.py b/frappe/templates/pages/print.py index 7842857c99..233ad17d11 100644 --- a/frappe/templates/pages/print.py +++ b/frappe/templates/pages/print.py @@ -192,7 +192,7 @@ def get_print_style(style=None): if not style: style = print_settings.print_style or "Standard" - context = {"print_settings": print_settings} + context = {"print_settings": print_settings, "print_style": style} css = frappe.get_template("templates/styles/standard.css").render(context) diff --git a/frappe/templates/styles/monochrome.css b/frappe/templates/styles/monochrome.css new file mode 100644 index 0000000000..0e68c34e29 --- /dev/null +++ b/frappe/templates/styles/monochrome.css @@ -0,0 +1,26 @@ +.print-format * { + color: #000 !important; +} + +.print-format .alert { + background-color: inherit; + border: 1px dashed #333; +} + +.print-format .table-bordered, +.print-format .table-bordered > thead > tr > th, +.print-format .table-bordered > tbody > tr > th, +.print-format .table-bordered > tfoot > tr > th, +.print-format .table-bordered > thead > tr > td, +.print-format .table-bordered > tbody > tr > td, +.print-format .table-bordered > tfoot > tr > td { + border: 1px solid #333; +} + +.print-format hr { + border-top: 1px solid #333; +} + +.print-heading { + border-bottom: 2px solid #333; +} diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css index bca1a55a97..0ba413b3f0 100644 --- a/frappe/templates/styles/standard.css +++ b/frappe/templates/styles/standard.css @@ -1,4 +1,87 @@ -{% include "public/css/print.css" %} +@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,700); + +@media screen { + .print-format-gutter { + background-color: #ddd; + padding: 15px 0px; + } + .print-format { + background-color: white; + box-shadow: 0px 0px 9px rgba(0,0,0,0.5); + max-width: 8.3in; + min-height: 11.69in; + padding: 0.75in; + margin: auto; + } + + .page-break { + padding: 30px 0px; + border-bottom: 1px dashed #888; + } + + .page-break:first-child { + padding-top: 0px; + } + + .page-break:last-child { + border-bottom: 0px; + } +} + +@media print { + .print-format p { + margin-left: 1px; + margin-right: 1px; + } +} + +.print-format { + font-size: 9pt; + font-family: 'Noto Sans', sans-serif; + -webkit-print-color-adjust:exact; +} + +.page-break { + page-break-after: always; +} + +.print-heading { + border-bottom: 2px solid #aaa; + margin-bottom: 10px; +} + +.print-heading h2 { + margin: 0px; +} +.print-heading h4 { + margin-top: 5px; +} + +table.no-border, table.no-border td { + border: 0px; +} + +.print-format label { + /* wkhtmltopdf breaks label into multiple lines when it is inline-block */ + display: block; +} + +.print-format img { + max-width: 100%; +} + +.print-format table td > .primary:first-child { + font-weight: bold; +} + +.print-format td, .print-format th { + vertical-align: top !important; + padding: 6px !important; +} + +.print-format p { + margin: 3px 0px 3px; +} .print-format { font-size: {{ print_settings.font_size|flt or 9 }}pt;