From 9f11f310f87209e50c48a852312cd442d0c373b4 Mon Sep 17 00:00:00 2001 From: Aviv Eyal Date: Mon, 25 Sep 2017 19:56:22 +0000 Subject: [PATCH] Make PHUITwoColumnView a little more printable Summary: Hide navbar, and make curtain behave like on a phone, when printing. Test Plan: {F5197340} Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D18583 --- resources/celerity/map.php | 18 ++++++------ webroot/rsrc/css/core/core.css | 5 ++++ webroot/rsrc/css/phui/phui-action-list.css | 5 ++++ webroot/rsrc/css/phui/phui-curtain-view.css | 28 +++++++++++++++++++ .../rsrc/css/phui/phui-two-column-view.css | 28 +++++++++++++++++++ 5 files changed, 75 insertions(+), 9 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 552fe22a68..6c7d2db90c 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => 'e68cf1fa', 'conpherence.pkg.js' => 'b5b51108', - 'core.pkg.css' => 'e9473020', + 'core.pkg.css' => '87a9a59b', 'core.pkg.js' => '28552e58', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '45951e9e', @@ -114,7 +114,7 @@ return array( 'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230', 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', - 'rsrc/css/core/core.css' => '1760853c', + 'rsrc/css/core/core.css' => '62fa3ace', 'rsrc/css/core/remarkup.css' => 'cad18339', 'rsrc/css/core/syntax.css' => 'cae95e89', 'rsrc/css/core/z-index.css' => '9d8f7c4b', @@ -137,7 +137,7 @@ return array( 'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6', 'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'bf094950', 'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea', - 'rsrc/css/phui/phui-action-list.css' => 'e7eba156', + 'rsrc/css/phui/phui-action-list.css' => 'f7f61a34', 'rsrc/css/phui/phui-action-panel.css' => 'b4798122', 'rsrc/css/phui/phui-badge.css' => '22c0cf4f', 'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3', @@ -148,7 +148,7 @@ return array( 'rsrc/css/phui/phui-comment-form.css' => 'ac68149f', 'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad', 'rsrc/css/phui/phui-crumbs-view.css' => '6ece3bbb', - 'rsrc/css/phui/phui-curtain-view.css' => 'ca363f15', + 'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026', 'rsrc/css/phui/phui-document-pro.css' => '8af7ea27', 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', 'rsrc/css/phui/phui-document.css' => 'c32e8dec', @@ -177,7 +177,7 @@ return array( 'rsrc/css/phui/phui-status.css' => 'd5263e49', 'rsrc/css/phui/phui-tag-view.css' => 'b4719c50', 'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca', - 'rsrc/css/phui/phui-two-column-view.css' => '1ade9c5f', + 'rsrc/css/phui/phui-two-column-view.css' => '44ec4951', 'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5', 'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455', 'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92', @@ -765,11 +765,11 @@ return array( 'path-typeahead' => 'f7fc67ec', 'people-picture-menu-item-css' => 'a06f7f34', 'people-profile-css' => '4df76faf', - 'phabricator-action-list-view-css' => 'e7eba156', + 'phabricator-action-list-view-css' => 'f7f61a34', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'd295b020', 'phabricator-content-source-view-css' => '4b8b05d4', - 'phabricator-core-css' => '1760853c', + 'phabricator-core-css' => '62fa3ace', 'phabricator-countdown-css' => '16c52f5c', 'phabricator-darklog' => 'c8e1ffe3', 'phabricator-darkmessage' => 'c48cccdd', @@ -833,7 +833,7 @@ return array( 'phui-comment-form-css' => 'ac68149f', 'phui-comment-panel-css' => 'f50152ad', 'phui-crumbs-view-css' => '6ece3bbb', - 'phui-curtain-view-css' => 'ca363f15', + 'phui-curtain-view-css' => '2bdaf026', 'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-view-css' => 'c32e8dec', 'phui-document-view-pro-css' => '8af7ea27', @@ -872,7 +872,7 @@ return array( 'phui-tag-view-css' => 'b4719c50', 'phui-theme-css' => '9f261c6b', 'phui-timeline-view-css' => 'f21db7ca', - 'phui-two-column-view-css' => '1ade9c5f', + 'phui-two-column-view-css' => '44ec4951', 'phui-workboard-color-css' => '783cdff5', 'phui-workboard-view-css' => '3bc85455', 'phui-workcard-view-css' => 'cca5fa92', diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css index 9d471477ed..cc14d7ab5a 100644 --- a/webroot/rsrc/css/core/core.css +++ b/webroot/rsrc/css/core/core.css @@ -61,6 +61,11 @@ body { overflow-y: scroll; } +body.printable, +!print body { + background: none; +} + textarea { font: inherit; } diff --git a/webroot/rsrc/css/phui/phui-action-list.css b/webroot/rsrc/css/phui/phui-action-list.css index a7ad662d33..5e32a1ea0a 100644 --- a/webroot/rsrc/css/phui/phui-action-list.css +++ b/webroot/rsrc/css/phui/phui-action-list.css @@ -7,6 +7,11 @@ display: none; } +!print .phabricator-action-list-view { + padding: 4px 0; + display: none; +} + .device .phuix-dropdown-menu .phabricator-action-list-view { /* When an action list view appears inside a dropdown menu, don't hide it by default. */ diff --git a/webroot/rsrc/css/phui/phui-curtain-view.css b/webroot/rsrc/css/phui/phui-curtain-view.css index 8bd8a331c4..3facf0fe37 100644 --- a/webroot/rsrc/css/phui/phui-curtain-view.css +++ b/webroot/rsrc/css/phui/phui-curtain-view.css @@ -21,6 +21,26 @@ border-top: 1px solid {$greybackground}; } +!print .phui-curtain-panel + .phui-curtain-panel { + padding: 8px 0; + border-top: none; +} + +!print .device-desktop .phabricator-action-list-view + .phui-curtain-panel { + padding: 8px 0; + border-top: none; +} + +!print .device-desktop .phui-curtain-panel + .phui-curtain-panel { + padding: 8px 0; + border-top: none; +} + +!print .phabricator-action-list-view + .phui-curtain-panel { + padding: 8px 0; + border-top: none; +} + .phui-curtain-panel-header { padding: 0 0 4px; color: {$bluetext}; @@ -37,6 +57,10 @@ padding: 0; } +!print .phui-curtain-panel-body { + padding: 0; +} + /* Project tags */ .phui-curtain-panel-body .phabricator-handle-tag-list-item { @@ -50,3 +74,7 @@ .device .curtain-no-panels { display: none; } + +!print .curtain-no-panels { + display: none; +} diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css index 2fb0eccee2..f9f86d950a 100644 --- a/webroot/rsrc/css/phui/phui-two-column-view.css +++ b/webroot/rsrc/css/phui/phui-two-column-view.css @@ -79,6 +79,30 @@ width: 300px; } +!print .phui-two-column-view .phui-main-column { + float: unset; + width: unset; + margin-bottom: 20px; +} + +!print .phui-two-column-view .phui-side-column { + float: unset; + width: unset; + margin-bottom: 20px; +} + +!print .device-desktop .phui-two-column-view .phui-main-column { + float: unset; + width: unset; + margin-bottom: 20px; +} + +!print .device-desktop .phui-two-column-view .phui-side-column { + float: unset; + width: unset; + margin-bottom: 20px; +} + .device-desktop .phui-two-column-view.phui-side-column-left .phui-main-column { float: right; width: calc(100% - 280px); @@ -307,3 +331,7 @@ .phui-mobile-menu { display: block; } + +!print .phabricator-side-menu { + display: none !important; +}