diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -146,7 +146,7 @@ 'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad', 'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa', 'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026', - 'rsrc/css/phui/phui-document-pro.css' => '0e41dd91', + 'rsrc/css/phui/phui-document-pro.css' => '1a08ef4b', 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', 'rsrc/css/phui/phui-document.css' => 'c4ac41f9', 'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9', @@ -814,7 +814,7 @@ 'phui-curtain-view-css' => '2bdaf026', 'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-view-css' => 'c4ac41f9', - 'phui-document-view-pro-css' => '0e41dd91', + 'phui-document-view-pro-css' => '1a08ef4b', 'phui-feed-story-css' => '44a9c8e9', 'phui-font-icon-base-css' => '870a7360', 'phui-fontkit-css' => '1320ed01', diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php --- a/src/view/phui/PHUIDocumentView.php +++ b/src/view/phui/PHUIDocumentView.php @@ -171,10 +171,20 @@ $table_of_contents, $this->header, $this->banner, - array( - $curtain, - $main_content, - ), + phutil_tag( + 'div', + array( + 'class' => 'phui-document-content-outer', + ), + phutil_tag( + 'div', + array( + 'class' => 'phui-document-content-inner', + ), + array( + $main_content, + $curtain, + ))), $foot_content, )); diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css --- a/webroot/rsrc/css/phui/phui-document-pro.css +++ b/webroot/rsrc/css/phui/phui-document-pro.css @@ -4,7 +4,7 @@ .phui-document-view.phui-document-view-pro { max-width: 800px; - padding: 16px 16px 64px 16px; + padding: 16px 16px 32px 16px; margin: 0 auto; } @@ -21,15 +21,25 @@ } .device-desktop .has-curtain .phui-document-content-view { - padding-right: 332px; + display: table-cell; } .printable .phui-document-content-view { padding-right: 0; } +.device-desktop .phui-document-content-outer { + display: table; + width: 100%; + layout: fixed; +} + +.device-desktop .phui-document-content-inner { + display: table-row; +} + .device-desktop .phui-document-curtain { - float: right; + display: table-cell; width: 300px; }