Page MenuHomePhabricator
Files F15367082

D18090.diff
No OneTemporary
Actions

D18090.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
@@ -9,7 +9,7 @@
'names' => array(
'conpherence.pkg.css' => 'ff161f2d',
'conpherence.pkg.js' => 'b5b51108',
- 'core.pkg.css' => '7e4901ea',
+ 'core.pkg.css' => 'ab24402f',
'core.pkg.js' => '1475bd91',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '1ccbf3a9',
@@ -157,7 +157,7 @@
'rsrc/css/phui/phui-form-view.css' => '6175808d',
'rsrc/css/phui/phui-form.css' => 'a5570f70',
'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
- 'rsrc/css/phui/phui-header-view.css' => '73edce66',
+ 'rsrc/css/phui/phui-header-view.css' => 'e7de7ee2',
'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
'rsrc/css/phui/phui-icon.css' => '4c46b6ba',
@@ -843,7 +843,7 @@
'phui-form-css' => 'a5570f70',
'phui-form-view-css' => '6175808d',
'phui-head-thing-view-css' => 'fd311e5f',
- 'phui-header-view-css' => '73edce66',
+ 'phui-header-view-css' => 'e7de7ee2',
'phui-hovercard' => '1bd28176',
'phui-hovercard-view-css' => 'f0592bcf',
'phui-icon-set-selector-css' => '87db8fee',
diff --git a/src/applications/uiexample/examples/PHUIBoxExample.php b/src/applications/uiexample/examples/PHUIBoxExample.php
--- a/src/applications/uiexample/examples/PHUIBoxExample.php
+++ b/src/applications/uiexample/examples/PHUIBoxExample.php
@@ -68,21 +68,10 @@
->setText(pht('Such Wow'))
->addClass(PHUI::MARGIN_SMALL_RIGHT);
- $badge1 = id(new PHUIBadgeMiniView())
- ->setIcon('fa-bug')
- ->setHeader(pht('Bugmeister'));
-
- $badge2 = id(new PHUIBadgeMiniView())
- ->setIcon('fa-heart')
- ->setHeader(pht('Funder'))
- ->setQuality(PhabricatorBadgesQuality::UNCOMMON);
-
$header = id(new PHUIHeaderView())
->setHeader(pht('Fancy Box'))
->addActionLink($button)
- ->setSubheader(pht('Much Features'))
- ->addBadge($badge1)
- ->addBadge($badge2);
+ ->setSubheader(pht('Much Features'));
$obj4 = id(new PHUIObjectBoxView())
->setHeader($header)
@@ -116,7 +105,9 @@
return phutil_tag(
'div',
- array(),
+ array(
+ 'class' => 'ml',
+ ),
array(
$head1,
$wrap1,
diff --git a/src/applications/uiexample/examples/PHUIHovercardUIExample.php b/src/applications/uiexample/examples/PHUIHovercardUIExample.php
--- a/src/applications/uiexample/examples/PHUIHovercardUIExample.php
+++ b/src/applications/uiexample/examples/PHUIHovercardUIExample.php
@@ -55,14 +55,6 @@
->addTag($tag));
$elements[] = $panel;
- $badge1 = id(new PHUIBadgeMiniView())
- ->setIcon('fa-book')
- ->setHeader(pht('Documenter'));
-
- $badge2 = id(new PHUIBadgeMiniView())
- ->setIcon('fa-star')
- ->setHeader(pht('Contributor'));
-
$user_handle = $this->createBasicDummyHandle(
'gwashington',
PhabricatorPeopleUserPHIDType::TYPECONST,
@@ -75,8 +67,6 @@
->addField(pht('Status'), pht('Available'))
->addField(pht('Member since'), '30. February 1750')
->addAction(pht('Send a Message'), '/dev/null')
- ->addBadge($badge1)
- ->addBadge($badge2)
->setUser($user));
$elements[] = $panel;
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -21,7 +21,6 @@
private $policyObject;
private $epoch;
private $actionItems = array();
- private $badges = array();
private $href;
private $actionList;
private $actionListID;
@@ -46,11 +45,6 @@
return $this;
}
- public function addBadge(PHUIBadgeMiniView $badge) {
- $this->badges[] = $badge;
- return $this;
- }
-
public function setImage($uri) {
$this->image = $uri;
return $this;
@@ -341,21 +335,13 @@
$header_content,
));
- if ($this->subheader || $this->badges) {
- $badges = null;
- if ($this->badges) {
- $badges = new PHUIBadgeBoxView();
- $badges->addItems($this->badges);
- $badges->setCollapsed(true);
- }
-
+ if ($this->subheader) {
$left[] = phutil_tag(
'div',
array(
'class' => 'phui-header-subheader',
),
array(
- $badges,
$this->subheader,
));
}
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -307,14 +307,6 @@
text-decoration: underline;
}
-.phui-header-subheader .phui-badge-flex-view {
- display: inline;
- margin-right: 4px;
-}
-
-.phui-header-subheader .phui-badge-flex-view:after {
- display: inline;
-}
/*** Profile Header ***********************************************************/

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 12, 4:03 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7589389
Default Alt Text
D18090.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility