Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15412899
D9408.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
14 KB
Referenced Files
None
Subscribers
None
D9408.id.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
return array(
'names' =>
array(
- 'core.pkg.css' => '73e14ee6',
+ 'core.pkg.css' => '703a28a5',
'core.pkg.js' => '9c9c8442',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '4a93db37',
@@ -135,7 +135,7 @@
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '43ed2d93',
'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec',
- 'rsrc/css/phui/phui-object-item-list-view.css' => '31d6da4e',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => '52a438e2',
'rsrc/css/phui/phui-pinboard-view.css' => '874c22f9',
'rsrc/css/phui/phui-property-list-view.css' => '2f7199e8',
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -762,7 +762,7 @@
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '43ed2d93',
'phui-object-box-css' => 'ce92d8ec',
- 'phui-object-item-list-view-css' => '31d6da4e',
+ 'phui-object-item-list-view-css' => '52a438e2',
'phui-pinboard-view-css' => '874c22f9',
'phui-property-list-view-css' => '2f7199e8',
'phui-remarkup-preview-css' => '19ad512b',
diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php
--- a/src/applications/audit/view/PhabricatorAuditListView.php
+++ b/src/applications/audit/view/PhabricatorAuditListView.php
@@ -103,7 +103,6 @@
$rowc = array();
$list = new PHUIObjectItemListView();
- $list->setCards(true);
foreach ($this->commits as $commit) {
$commit_phid = $commit->getPHID();
$commit_handle = $this->getHandle($commit_phid);
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -45,7 +45,6 @@
private function buildIssueList(array $issues) {
assert_instances_of($issues, 'PhabricatorSetupIssue');
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$ignored_items = array();
foreach ($issues as $issue) {
diff --git a/src/applications/daemon/view/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
--- a/src/applications/daemon/view/PhabricatorDaemonLogListView.php
+++ b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
@@ -18,7 +18,6 @@
}
$list = id(new PHUIObjectItemListView())
- ->setCards(true)
->setFlush(true);
foreach ($this->daemonLogs as $log) {
$id = $log->getID();
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -75,7 +75,6 @@
$this->requireResource('aphront-tooltip-css');
$list = new PHUIObjectItemListView();
- $list->setCards(true);
foreach ($this->revisions as $revision) {
$item = id(new PHUIObjectItemView())
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -185,7 +185,6 @@
$viewer = $this->requireViewer();
$list = new PHUIObjectItemListView();
- $list->setCards(true);
foreach ($buildables as $buildable) {
$id = $buildable->getID();
diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
@@ -173,8 +173,7 @@
$content_type_map = HeraldAdapter::getEnabledAdapterMap($viewer);
$list = id(new PHUIObjectItemListView())
- ->setUser($viewer)
- ->setCards(true);
+ ->setUser($viewer);
foreach ($rules as $rule) {
$id = $rule->getID();
diff --git a/src/applications/herald/query/HeraldTranscriptSearchEngine.php b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
--- a/src/applications/herald/query/HeraldTranscriptSearchEngine.php
+++ b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
@@ -108,7 +108,6 @@
$viewer = $this->requireViewer();
$list = new PHUIObjectItemListView();
- $list->setCards(true);
foreach ($transcripts as $xscript) {
$view_href = phutil_tag(
'a',
diff --git a/src/applications/herald/view/HeraldRuleEditHistoryView.php b/src/applications/herald/view/HeraldRuleEditHistoryView.php
--- a/src/applications/herald/view/HeraldRuleEditHistoryView.php
+++ b/src/applications/herald/view/HeraldRuleEditHistoryView.php
@@ -23,7 +23,6 @@
public function render() {
$list = new PHUIObjectItemListView();
$list->setFlush(true);
- $list->setCards(true);
foreach ($this->edits as $edit) {
$name = nonempty($edit->getRuleName(), 'Unknown Rule');
diff --git a/src/applications/home/controller/PhabricatorHomeQuickCreateController.php b/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
--- a/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
+++ b/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
@@ -9,7 +9,6 @@
$items = $this->getCurrentApplication()->loadAllQuickCreateItems($viewer);
$list = id(new PHUIObjectItemListView())
- ->setCards(true)
->setUser($viewer);
foreach ($items as $item) {
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -36,7 +36,6 @@
$handles = $this->handles;
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->setFlush(true);
$status_map = ManiphestTaskStatus::getTaskStatusMap();
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -260,7 +260,6 @@
$handles = $this->loadViewerHandles($phids);
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->setFlush(true);
$first = true;
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -40,7 +40,6 @@
$handles = $this->loadViewerHandles($author_phids);
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->setFlush(true);
foreach ($history as $content) {
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -173,7 +173,6 @@
$cards = id(new PHUIObjectItemListView())
->setUser($viewer)
- ->setCards(true)
->setFlush(true)
->setAllowEmptyList(true)
->addSigil('project-column')
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -234,7 +234,6 @@
$viewer = $this->requireViewer();;
$list = new PHUIObjectItemListView();
- $list->setCards(true);
foreach ($repositories as $repository) {
$id = $repository->getID();
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
--- a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
@@ -35,7 +35,6 @@
$linked = id(new PHUIObjectItemListView())
->setUser($viewer)
- ->setCards(true)
->setFlush(true)
->setNoDataString(pht('You have no linked accounts.'));
@@ -99,7 +98,6 @@
$linkable = id(new PHUIObjectItemListView())
->setUser($viewer)
- ->setCards(true)
->setFlush(true)
->setNoDataString(
pht('Your account is linked with all available providers.'));
diff --git a/src/applications/uiexample/examples/PHUIObjectItemListExample.php b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
--- a/src/applications/uiexample/examples/PHUIObjectItemListExample.php
+++ b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
@@ -113,7 +113,6 @@
$head = id(new PHUIHeaderView())
->setHeader(pht('Card List'));
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->addItem(
id(new PHUIObjectItemView())
@@ -161,7 +160,6 @@
$head = id(new PHUIHeaderView())
->setHeader(pht('Grippable List'));
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->addItem(
id(new PHUIObjectItemView())
diff --git a/src/applications/uiexample/examples/PHUIWorkboardExample.php b/src/applications/uiexample/examples/PHUIWorkboardExample.php
--- a/src/applications/uiexample/examples/PHUIWorkboardExample.php
+++ b/src/applications/uiexample/examples/PHUIWorkboardExample.php
@@ -15,7 +15,6 @@
/* List 1 */
$list = new PHUIObjectItemListView();
- $list->setCards(true);
$list->setFlush(true);
$list->addItem(
@@ -43,7 +42,6 @@
/* List 2 */
$list2 = new PHUIObjectItemListView();
- $list2->setCards(true);
$list2->setFlush(true);
$list2->addItem(
@@ -58,7 +56,6 @@
/* List 3 */
$list3 = new PHUIObjectItemListView();
- $list3->setCards(true);
$list3->setFlush(true);
$list3->addItem(
@@ -100,7 +97,6 @@
->setBarColor('orange'));
$panel = id(new PHUIWorkpanelView())
- ->setCards($list)
->setHeader('Business Stuff')
->setFooterAction(
id(new PHUIListItemView())
@@ -109,11 +105,9 @@
->setHref('/maniphest/task/create/'));
$panel2 = id(new PHUIWorkpanelView())
- ->setCards($list2)
->setHeader('Under Duress');
$panel3 = id(new PHUIWorkpanelView())
- ->setCards($list3)
->setHeader('Spicy Thai Chicken');
$board = id(new PHUIWorkboardView())
diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php
--- a/src/view/phui/PHUIObjectItemListView.php
+++ b/src/view/phui/PHUIObjectItemListView.php
@@ -6,7 +6,6 @@
private $items;
private $pager;
private $stackable;
- private $cards;
private $noDataString;
private $flush;
private $plain;
@@ -58,11 +57,6 @@
return $this;
}
- public function setCards($cards) {
- $this->cards = $cards;
- return $this;
- }
-
public function setStates($states) {
$this->states = $states;
return $this;
@@ -79,11 +73,9 @@
if ($this->stackable) {
$classes[] = 'phui-object-list-stackable';
}
- if ($this->cards) {
- $classes[] = 'phui-object-list-cards';
- }
if ($this->states) {
$classes[] = 'phui-object-list-states';
+ $classes[] = 'phui-object-list-stackable';
}
if ($this->flush) {
$classes[] = 'phui-object-list-flush';
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -34,12 +34,14 @@
}
.phui-object-item {
- background: #fff;
border-style: solid;
border-color: {$lightgreyborder};
- border-width: 0 0 0 4px;
margin: 5px 0;
overflow: hidden;
+ border-radius: 3px;
+ border-left-width: 6px;
+ background: #f0f0f0 url('/rsrc/image/texture/card-gradient.png') repeat-x;
+ margin-bottom: 4px;
}
.phui-object-item .phui-icon-view {
@@ -54,9 +56,6 @@
position: relative;
min-height: 29px;
overflow: hidden;
-}
-
-.phui-object-list-cards .phui-object-item-frame {
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
@@ -187,10 +186,16 @@
.phui-object-item-list-view.phui-object-list-stackable
.phui-object-item {
margin: -1px 0 0 0;
+ border-radius: 0;
+ border-left-width: 1px;
+ background: #fff;
+}
+
+.phui-object-list-stackable .phui-object-item-frame {
+ border-radius: 0;
}
.phui-object-list-stackable .phui-object-item {
- border-left-width: 1px;
}
.device-desktop .phui-object-list-stackable
@@ -435,14 +440,18 @@
background: {$lightyellow};
}
-.phui-object-list-cards
- .phui-object-item.phui-object-item-highlighted {
+.phui-object-item.phui-object-item-highlighted {
background-image: linear-gradient(to bottom, rgb(253, 255, 221), rgb(243, 245, 206));
background-image: -webkit-linear-gradient(top, rgb(253, 255, 221), rgb(243, 245, 206));
}
.phui-object-item-selected {
background: {$lightblue};
+ border-left-color: {$blue};
+}
+
+.phui-object-item-selected .phui-object-item-frame {
+ border-color: {$blue};
}
@@ -531,33 +540,6 @@
font-size: 13px;
}
-/* - Card List -----------------------------------------------------------------
-
- Rounded card list.
-
-*/
-
-/* Hard to sprite since we can't have other sprites appearing in tall cells */
-.phui-object-list-cards .phui-object-item {
- border-radius: 3px;
- border-left-width: 6px;
- background: #f0f0f0 url('/rsrc/image/texture/card-gradient.png') repeat-x;
- margin-bottom: 4px;
-}
-
-.phui-object-list-cards .phui-object-item-frame {
- min-height: 50px;
-}
-
-.phui-object-list-cards .phui-object-item-selected {
- background: #bfdcff;
-}
-
-.phui-object-list-cards .phui-object-item-selected
- .phui-object-item-frame {
- border-color: #99ccff;
-}
-
/* - Draggable List ------------------------------------------------------------
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 20, 3:40 PM (4 w, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7604166
Default Alt Text
D9408.id.diff (14 KB)
Attached To
Mode
D9408: Make ObjectItem default as "Card"
Attached
Detach File
Event Timeline
Log In to Comment