Page MenuHomePhabricator
Files F15464846

D18292.id43988.diff
No OneTemporary
Actions

D18292.id43988.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' => 'e68cf1fa',
'conpherence.pkg.js' => 'b5b51108',
- 'core.pkg.css' => 'd6046dd9',
+ 'core.pkg.css' => 'd9c9cfd0',
'core.pkg.js' => '5d80e0db',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '45951e9e',
@@ -127,7 +127,7 @@
'rsrc/css/layout/phabricator-source-code-view.css' => 'aea41829',
'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
- 'rsrc/css/phui/button/phui-button.css' => '3a744520',
+ 'rsrc/css/phui/button/phui-button.css' => '3ca51caa',
'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600',
'rsrc/css/phui/calendar/phui-calendar-month.css' => '21154caf',
@@ -825,7 +825,7 @@
'phui-big-info-view-css' => 'd13afcde',
'phui-box-css' => '745e881d',
'phui-button-bar-css' => 'f1ff5494',
- 'phui-button-css' => '3a744520',
+ 'phui-button-css' => '3ca51caa',
'phui-button-simple-css' => '8e1baf68',
'phui-calendar-css' => 'f1ddf11c',
'phui-calendar-day-css' => '572b1893',
diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php
--- a/src/applications/ponder/view/PonderAnswerView.php
+++ b/src/applications/ponder/view/PonderAnswerView.php
@@ -74,7 +74,6 @@
->setTag('a')
->setText(pht('Actions'))
->setHref('#')
- ->setIcon('fa-bars')
->setDropdownMenu($actions);
$header_name = phutil_tag(
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
@@ -554,7 +554,7 @@
return id(new PHUIButtonView())
->setTag('a')
->setHref('#')
- ->setText(pht('Use Results...'))
+ ->setText(pht('Use Results'))
->setIcon('fa-bars')
->setDropdownMenu($action_list)
->addClass('dropdown');
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -134,6 +134,7 @@
Javelin::initBehavior('phui-dropdown-menu');
$this->addSigil('phui-dropdown-menu');
+ $this->setDropdown(true);
$this->setMetadata($actions->getDropdownMenuMetadata());
return $this;
@@ -223,32 +224,29 @@
protected function getTagContent() {
- $icon = null;
- $text = $this->text;
- if ($this->icon) {
- $icon = $this->icon;
-
- $subtext = null;
- if ($this->subtext) {
- $subtext = phutil_tag(
- 'div',
- array(
- 'class' => 'phui-button-subtext',
- ),
- $this->subtext);
- }
-
- if ($this->text !== null) {
- $text = phutil_tag(
- 'div',
- array(
- 'class' => 'phui-button-text',
- ),
- array(
- $text,
- $subtext,
- ));
- }
+ $icon = $this->icon;
+ $text = null;
+ $subtext = null;
+
+ if ($this->subtext) {
+ $subtext = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-button-subtext',
+ ),
+ $this->subtext);
+ }
+
+ if ($this->text !== null) {
+ $text = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-button-text',
+ ),
+ array(
+ $this->text,
+ $subtext,
+ ));
}
$caret = null;
@@ -259,7 +257,7 @@
if ($this->iconFirst == true) {
return array($icon, $text, $caret);
} else {
- return array($text, $icon);
+ return array($text, $icon, $caret);
}
}
}
diff --git a/webroot/rsrc/css/phui/button/phui-button.css b/webroot/rsrc/css/phui/button/phui-button.css
--- a/webroot/rsrc/css/phui/button/phui-button.css
+++ b/webroot/rsrc/css/phui/button/phui-button.css
@@ -270,7 +270,7 @@
}
.dropdown .phui-button-text {
- margin-right: 16px;
+ margin-right: 8px;
}
.button.has-icon .phui-button-text {

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 3, 12:55 PM (4 d, 3 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7227712
Default Alt Text
D18292.id43988.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility