Page MenuHomePhabricator
Files F15434728

D16469.id.diff
No OneTemporary
Actions

D16469.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
@@ -100,7 +100,7 @@
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
- 'rsrc/css/application/search/application-search-view.css' => 'b3e0e5ef',
+ 'rsrc/css/application/search/application-search-view.css' => 'be6454ec',
'rsrc/css/application/search/search-results.css' => '7dea472c',
'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
@@ -542,7 +542,7 @@
'aphront-tokenizer-control-css' => '056da01b',
'aphront-tooltip-css' => '1a07aea8',
'aphront-typeahead-control-css' => 'd4f16145',
- 'application-search-view-css' => 'b3e0e5ef',
+ 'application-search-view-css' => 'be6454ec',
'auth-css' => '0877ed6e',
'bulk-job-css' => 'df9c1d4a',
'changeset-view-manager' => 'a2828756',
diff --git a/src/applications/phortune/controller/PhortuneAccountListController.php b/src/applications/phortune/controller/PhortuneAccountListController.php
--- a/src/applications/phortune/controller/PhortuneAccountListController.php
+++ b/src/applications/phortune/controller/PhortuneAccountListController.php
@@ -39,7 +39,7 @@
->setHeader($account->getName())
->setHref($this->getApplicationURI($account->getID().'/'))
->setObject($account)
- ->setIcon('fa-credit-card');
+ ->setImageIcon('fa-credit-card');
$payment_list->addItem($item);
}
@@ -71,7 +71,7 @@
->setHeader($merchant->getName())
->setHref($this->getApplicationURI('/merchant/'.$merchant->getID().'/'))
->setObject($merchant)
- ->setIcon('fa-bank');
+ ->setImageIcon('fa-bank');
$merchant_list->addItem($item);
}
diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/PhortuneProductListController.php
--- a/src/applications/phortune/controller/PhortuneProductListController.php
+++ b/src/applications/phortune/controller/PhortuneProductListController.php
@@ -41,7 +41,7 @@
->setHeader($product->getProductName())
->setHref($view_uri)
->addAttribute($price->formatForDisplay())
- ->setIcon('fa-gift');
+ ->setImageIcon('fa-gift');
$product_list->addItem($item);
}
diff --git a/src/applications/phortune/query/PhortuneMerchantSearchEngine.php b/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
--- a/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
+++ b/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
@@ -74,7 +74,7 @@
->setHeader($merchant->getName())
->setHref('/phortune/merchant/'.$merchant->getID().'/')
->setObject($merchant)
- ->setIcon('fa-bank');
+ ->setImageIcon('fa-bank');
$list->addItem($item);
}
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -270,9 +270,6 @@
if ($list->getContent()) {
$box->appendChild($list->getContent());
}
- if ($list->getCollapsed()) {
- $box->setCollapsed(true);
- }
$result_header = $list->getHeader();
if ($result_header) {
diff --git a/src/applications/search/view/PhabricatorApplicationSearchResultView.php b/src/applications/search/view/PhabricatorApplicationSearchResultView.php
--- a/src/applications/search/view/PhabricatorApplicationSearchResultView.php
+++ b/src/applications/search/view/PhabricatorApplicationSearchResultView.php
@@ -12,7 +12,6 @@
private $content = null;
private $infoView = null;
private $actions = array();
- private $collapsed = null;
private $noDataString;
private $crumbs = array();
private $header;
@@ -70,15 +69,6 @@
return $this->actions;
}
- public function setCollapsed($collapsed) {
- $this->collapsed = $collapsed;
- return $this;
- }
-
- public function getCollapsed() {
- return $this->collapsed;
- }
-
public function setNoDataString($nodata) {
$this->noDataString = $nodata;
return $this;
diff --git a/webroot/rsrc/css/application/search/application-search-view.css b/webroot/rsrc/css/application/search/application-search-view.css
--- a/webroot/rsrc/css/application/search/application-search-view.css
+++ b/webroot/rsrc/css/application/search/application-search-view.css
@@ -16,6 +16,11 @@
border-bottom: 1px solid {$thinblueborder};
}
+.application-search-view .phui-object-box.phui-object-box-collapsed
+ .phui-header-shell {
+ padding: 20px 8px;
+}
+
.application-search-results
.phui-profile-header.phui-header-shell .phui-header-header {
font-size: 20px;

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 5:02 AM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223478
Default Alt Text
D16469.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility