1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00

Slimmer Shade Tags

Summary: Shaves a pixel for use in ObjectLists.

Test Plan:
UIExamples.

{F170655}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9746
This commit is contained in:
Chad Little 2014-06-26 14:19:32 -07:00
parent f967678236
commit e096a227db
4 changed files with 31 additions and 4 deletions

View file

@ -7,7 +7,7 @@
return array( return array(
'names' => 'names' =>
array( array(
'core.pkg.css' => 'b2a7a97c', 'core.pkg.css' => 'c494bff8',
'core.pkg.js' => '834b4eda', 'core.pkg.js' => '834b4eda',
'darkconsole.pkg.js' => 'df001cab', 'darkconsole.pkg.js' => 'df001cab',
'differential.pkg.css' => '4a93db37', 'differential.pkg.css' => '4a93db37',
@ -141,7 +141,7 @@ return array(
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '2f562399', 'rsrc/css/phui/phui-status.css' => '2f562399',
'rsrc/css/phui/phui-tag-view.css' => '4f920464', 'rsrc/css/phui/phui-tag-view.css' => '30dd4e6f',
'rsrc/css/phui/phui-text.css' => '23e9b4b7', 'rsrc/css/phui/phui-text.css' => '23e9b4b7',
'rsrc/css/phui/phui-timeline-view.css' => 'bbd990d0', 'rsrc/css/phui/phui-timeline-view.css' => 'bbd990d0',
'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00', 'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00',
@ -787,7 +787,7 @@ return array(
'phui-remarkup-preview-css' => '19ad512b', 'phui-remarkup-preview-css' => '19ad512b',
'phui-spacing-css' => '042804d6', 'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '2f562399', 'phui-status-list-view-css' => '2f562399',
'phui-tag-view-css' => '4f920464', 'phui-tag-view-css' => '30dd4e6f',
'phui-text-css' => '23e9b4b7', 'phui-text-css' => '23e9b4b7',
'phui-timeline-view-css' => 'bbd990d0', 'phui-timeline-view-css' => 'bbd990d0',
'phui-workboard-view-css' => '2bf82d00', 'phui-workboard-view-css' => '2bf82d00',

View file

@ -165,6 +165,14 @@ final class PHUITagExample extends PhabricatorUIExample {
->setIcon('fa-tags') ->setIcon('fa-tags')
->setName(ucwords($shade)) ->setName(ucwords($shade))
->setHref('#'); ->setHref('#');
$tags[] = hsprintf(' ');
$tags[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setShade($shade)
->setSlimShady(true)
->setIcon('fa-tags')
->setName(ucwords($shade))
->setHref('#');
$tags[] = hsprintf('<br /><br />'); $tags[] = hsprintf('<br /><br />');
} }

View file

@ -34,6 +34,7 @@ final class PHUITagView extends AphrontTagView {
private $external; private $external;
private $icon; private $icon;
private $shade; private $shade;
private $slimShady;
public function setType($type) { public function setType($type) {
$this->type = $type; $this->type = $type;
@ -90,6 +91,11 @@ final class PHUITagView extends AphrontTagView {
return $this; return $this;
} }
public function setSlimShady($mm) {
$this->slimShady = $mm;
return $this;
}
protected function getTagName() { protected function getTagName() {
return strlen($this->href) ? 'a' : 'span'; return strlen($this->href) ? 'a' : 'span';
} }
@ -105,9 +111,11 @@ final class PHUITagView extends AphrontTagView {
if ($this->shade) { if ($this->shade) {
$classes[] = 'phui-tag-shade'; $classes[] = 'phui-tag-shade';
$classes[] = 'phui-tag-shade-'.$this->shade; $classes[] = 'phui-tag-shade-'.$this->shade;
if ($this->slimShady) {
$classes[] = 'phui-tag-shade-slim';
}
} }
if ($this->icon) { if ($this->icon) {
$classes[] = 'phui-tag-icon-view'; $classes[] = 'phui-tag-icon-view';
} }

View file

@ -158,6 +158,17 @@ a.phui-tag-view:hover
left: 6px; left: 6px;
} }
.phui-tag-shade-slim .phui-icon-view {
font-size: 11px;
top: 3px;
left: 6px;
}
.phui-tag-shade-slim.phui-tag-icon-view .phui-tag-core {
padding-left: 20px;
font-size: 12px;
}
.phui-tag-shade-red .phui-tag-core { .phui-tag-shade-red .phui-tag-core {
background-color: {$sh-redbackground}; background-color: {$sh-redbackground};
border-color: {$sh-lightredborder}; border-color: {$sh-lightredborder};