mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-26 08:42:41 +01:00
Fix some content/background overflow issues with commit graph lists
Summary: Ref T13552. There are currently some content overflow issues on the graph view where the menu height can exceed the content height and the frame is drawn on a sub-element. Make the frame draw around all the content. Test Plan: Viewed commit graph history view, saw more sensible UI. Maniphest Tasks: T13552 Differential Revision: https://secure.phabricator.com/D21440
This commit is contained in:
parent
0b64092d25
commit
429543b637
3 changed files with 23 additions and 22 deletions
|
@ -9,7 +9,7 @@ return array(
|
||||||
'names' => array(
|
'names' => array(
|
||||||
'conpherence.pkg.css' => '0e3cf785',
|
'conpherence.pkg.css' => '0e3cf785',
|
||||||
'conpherence.pkg.js' => '020aebcf',
|
'conpherence.pkg.js' => '020aebcf',
|
||||||
'core.pkg.css' => '2ffd6897',
|
'core.pkg.css' => 'b13bef94',
|
||||||
'core.pkg.js' => 'adc34883',
|
'core.pkg.js' => 'adc34883',
|
||||||
'dark-console.pkg.js' => '187792c2',
|
'dark-console.pkg.js' => '187792c2',
|
||||||
'differential.pkg.css' => '5c459f92',
|
'differential.pkg.css' => '5c459f92',
|
||||||
|
@ -137,7 +137,7 @@ return array(
|
||||||
'rsrc/css/phui/object-item/phui-oi-color.css' => 'b517bfa0',
|
'rsrc/css/phui/object-item/phui-oi-color.css' => 'b517bfa0',
|
||||||
'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'da15d3dc',
|
'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'da15d3dc',
|
||||||
'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '490e2e2e',
|
'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '490e2e2e',
|
||||||
'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ecd651d5',
|
'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'af98a277',
|
||||||
'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => '6a30fa46',
|
'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => '6a30fa46',
|
||||||
'rsrc/css/phui/phui-action-list.css' => '1b0085b2',
|
'rsrc/css/phui/phui-action-list.css' => '1b0085b2',
|
||||||
'rsrc/css/phui/phui-action-panel.css' => '6c386cbf',
|
'rsrc/css/phui/phui-action-panel.css' => '6c386cbf',
|
||||||
|
@ -874,7 +874,7 @@ return array(
|
||||||
'phui-oi-color-css' => 'b517bfa0',
|
'phui-oi-color-css' => 'b517bfa0',
|
||||||
'phui-oi-drag-ui-css' => 'da15d3dc',
|
'phui-oi-drag-ui-css' => 'da15d3dc',
|
||||||
'phui-oi-flush-ui-css' => '490e2e2e',
|
'phui-oi-flush-ui-css' => '490e2e2e',
|
||||||
'phui-oi-list-view-css' => 'ecd651d5',
|
'phui-oi-list-view-css' => 'af98a277',
|
||||||
'phui-oi-simple-ui-css' => '6a30fa46',
|
'phui-oi-simple-ui-css' => '6a30fa46',
|
||||||
'phui-pager-css' => 'd022c7ad',
|
'phui-pager-css' => 'd022c7ad',
|
||||||
'phui-pinboard-view-css' => '1f08f5d8',
|
'phui-pinboard-view-css' => '1f08f5d8',
|
||||||
|
|
|
@ -816,6 +816,23 @@ final class PHUIObjectItemView extends AphrontTagView {
|
||||||
$box,
|
$box,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
if ($this->menu) {
|
||||||
|
$grid_view = id(new FuelGridView())
|
||||||
|
->addClass('fuel-grid-tablet');
|
||||||
|
$grid_row = $grid_view->newRow();
|
||||||
|
|
||||||
|
$grid_row->newCell()
|
||||||
|
->setContent($frame_content);
|
||||||
|
|
||||||
|
$menu = $this->menu;
|
||||||
|
|
||||||
|
$grid_row->newCell()
|
||||||
|
->addClass('phui-oi-menu')
|
||||||
|
->setContent($menu);
|
||||||
|
|
||||||
|
$frame_content = $grid_view;
|
||||||
|
}
|
||||||
|
|
||||||
$frame_cover = null;
|
$frame_cover = null;
|
||||||
if ($this->coverImage) {
|
if ($this->coverImage) {
|
||||||
$cover_image = phutil_tag(
|
$cover_image = phutil_tag(
|
||||||
|
@ -843,22 +860,7 @@ final class PHUIObjectItemView extends AphrontTagView {
|
||||||
$frame_content,
|
$frame_content,
|
||||||
));
|
));
|
||||||
|
|
||||||
$grid_view = id(new FuelGridView())
|
return $frame;
|
||||||
->addClass('fuel-grid-tablet');
|
|
||||||
$grid_row = $grid_view->newRow();
|
|
||||||
|
|
||||||
$grid_row->newCell()
|
|
||||||
->setContent($frame);
|
|
||||||
|
|
||||||
if ($this->menu) {
|
|
||||||
$menu = $this->menu;
|
|
||||||
|
|
||||||
$grid_row->newCell()
|
|
||||||
->addClass('phui-oi-menu')
|
|
||||||
->setContent($menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $grid_view;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function renderStatusIcon($icon, $label) {
|
private function renderStatusIcon($icon, $label) {
|
||||||
|
|
|
@ -736,10 +736,9 @@ ul.phui-oi-list-view .phui-oi-selectable
|
||||||
.device-desktop .phui-oi-menu,
|
.device-desktop .phui-oi-menu,
|
||||||
.device-tablet .phui-oi-menu {
|
.device-tablet .phui-oi-menu {
|
||||||
width: 200px;
|
width: 200px;
|
||||||
border-width: 0 0 1px 1px;
|
border-width: 0 0 0 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.device-phone .phui-oi-menu {
|
.device-phone .phui-oi-menu {
|
||||||
border-width: 0 0 1px;
|
border-width: 1px 0 0;
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue