From 8ff9d52a5941a53844c8efe0f01ba43452fce8fd Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 18 Dec 2014 14:42:26 -0800 Subject: [PATCH] Fix property list stacked UI Summary: The stacked version of property lists is supposed to display like a normal definition list. Test Plan: Test the stacked layout in Herald. Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11014 --- resources/celerity/map.php | 6 ++-- src/view/phui/PHUIPropertyListView.php | 4 +-- .../rsrc/css/phui/phui-property-list-view.css | 29 ++++++++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index af090095fe..e9243a6003 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '2beb34f5', + 'core.pkg.css' => '03a41753', 'core.pkg.js' => 'bc72b978', 'darkconsole.pkg.js' => 'df001cab', 'differential.pkg.css' => '8af45893', @@ -137,7 +137,7 @@ return array( 'rsrc/css/phui/phui-object-box.css' => 'e9f7e938', 'rsrc/css/phui/phui-object-item-list-view.css' => '4e541c2c', 'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269', - 'rsrc/css/phui/phui-property-list-view.css' => '86f9df88', + 'rsrc/css/phui/phui-property-list-view.css' => '51480060', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-status.css' => '888cedb8', @@ -787,7 +787,7 @@ return array( 'phui-object-box-css' => 'e9f7e938', 'phui-object-item-list-view-css' => '4e541c2c', 'phui-pinboard-view-css' => '3dd4a269', - 'phui-property-list-view-css' => '86f9df88', + 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => '888cedb8', diff --git a/src/view/phui/PHUIPropertyListView.php b/src/view/phui/PHUIPropertyListView.php index 95d0528571..e5b8500c5b 100644 --- a/src/view/phui/PHUIPropertyListView.php +++ b/src/view/phui/PHUIPropertyListView.php @@ -204,7 +204,7 @@ final class PHUIPropertyListView extends AphrontView { $list = phutil_tag( 'dl', array( - 'class' => 'phui-property-list-properties '.$stacked, + 'class' => 'phui-property-list-properties', ), $items); @@ -216,7 +216,7 @@ final class PHUIPropertyListView extends AphrontView { $list = phutil_tag( 'div', array( - 'class' => 'phui-property-list-properties-wrap', + 'class' => 'phui-property-list-properties-wrap '.$stacked, ), array($shortcuts, $list)); diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css index a3dd186d81..dc51b69a23 100644 --- a/webroot/rsrc/css/phui/phui-property-list-view.css +++ b/webroot/rsrc/css/phui/phui-property-list-view.css @@ -55,13 +55,19 @@ margin-bottom: 4px; } -.device .phui-property-list-key, -.phui-property-list-properties.phui-property-list-stacked - .phui-property-list-key { - padding-left: 12px; - text-align: left; - margin-left: 0; +.phui-property-list-properties-wrap.phui-property-list-stacked { width: auto; + float: none; +} + +.device .phui-property-list-key, +.phui-property-list-stacked .phui-property-list-properties + .phui-property-list-key { + padding-left: 12px; + text-align: left; + margin-left: 0; + width: auto; + float: none; } .phui-property-list-value { @@ -77,12 +83,13 @@ } .device .phui-property-list-value, -.phui-property-list-properties.phui-property-list-stacked +.phui-property-list-stacked .phui-property-list-properties .phui-property-list-value { - padding: 0 16px; - margin-bottom: 8px; - width: auto; - word-break: break-word; + padding: 0 16px; + margin-bottom: 8px; + width: auto; + word-break: break-word; + float: none; } .phui-property-list-section-header {