revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 08:42:41 +01:00
Code Issues Releases Wiki Activity

Layout Phriction actions without floats, to avoid conflicts with floating content

Browse source 
Summary:
Ref T13195. If a Phriction page begins with a code block, the `clear: both;` currently makes it clear the action list.

Instead, use table-cell layout on desktops.

Test Plan: Viewed a Phriction page with an initial code block on desktop/tablet/mobile/printable layouts. Now got more sensible layouts in all cases.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: GoogleLegacy

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19649
This commit is contained in:
epriestley 2018-09-07 12:18:39 -07:00
parent 2a03367a50
commit 6dc721009d
3 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/celerity/map.php
View file

@ -146,7 +146,7 @@ return array(
'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad', 'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa', 'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026', '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-summary.css' => '9ca48bdf',
'rsrc/css/phui/phui-document.css' => 'c4ac41f9', 'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9', 'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@ -814,7 +814,7 @@ return array(
'phui-curtain-view-css' => '2bdaf026', 'phui-curtain-view-css' => '2bdaf026',
'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-summary-view-css' => '9ca48bdf',
'phui-document-view-css' => 'c4ac41f9', 'phui-document-view-css' => 'c4ac41f9',
'phui-document-view-pro-css' => '0e41dd91', 'phui-document-view-pro-css' => '1a08ef4b',
'phui-feed-story-css' => '44a9c8e9', 'phui-feed-story-css' => '44a9c8e9',
'phui-font-icon-base-css' => '870a7360', 'phui-font-icon-base-css' => '870a7360',
'phui-fontkit-css' => '1320ed01', 'phui-fontkit-css' => '1320ed01',

18
src/view/phui/PHUIDocumentView.php
View file

@ -171,10 +171,20 @@ final class PHUIDocumentView extends AphrontTagView {
$table_of_contents, $table_of_contents,
$this->header, $this->header,
$this->banner, $this->banner,
array( phutil_tag(
$curtain, 'div',
$main_content, array(
), 'class' => 'phui-document-content-outer',
),
phutil_tag(
'div',
array(
'class' => 'phui-document-content-inner',
),
array(
$main_content,
$curtain,
))),
$foot_content, $foot_content,
)); ));

16
webroot/rsrc/css/phui/phui-document-pro.css
View file

@ -4,7 +4,7 @@
.phui-document-view.phui-document-view-pro { .phui-document-view.phui-document-view-pro {
max-width: 800px; max-width: 800px;
padding: 16px 16px 64px 16px; padding: 16px 16px 32px 16px;
margin: 0 auto; margin: 0 auto;
} }
@ -21,15 +21,25 @@
} }
.device-desktop .has-curtain .phui-document-content-view { .device-desktop .has-curtain .phui-document-content-view {
padding-right: 332px; display: table-cell;
} }
.printable .phui-document-content-view { .printable .phui-document-content-view {
padding-right: 0; 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 { .device-desktop .phui-document-curtain {
float: right; display: table-cell;
width: 300px; width: 300px;
} }