Page MenuHomePhabricator
Files F15380636

D18074.diff
No OneTemporary
Actions

D18074.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' => '8ac2e6b8',
+ 'core.pkg.css' => '5284a0e0',
'core.pkg.js' => '1475bd91',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => 'a2755617',
@@ -71,7 +71,7 @@
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
- 'rsrc/css/application/diffusion/diffusion-history.css' => 'de70e348',
+ 'rsrc/css/application/diffusion/diffusion-history.css' => 'cc283766',
'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
@@ -175,7 +175,7 @@
'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => 'd5263e49',
- 'rsrc/css/phui/phui-tag-view.css' => '3fa7765e',
+ 'rsrc/css/phui/phui-tag-view.css' => '93b084cf',
'rsrc/css/phui/phui-timeline-view.css' => '313c7f22',
'rsrc/css/phui/phui-two-column-view.css' => 'ce9fa0b7',
'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
@@ -567,7 +567,7 @@
'differential-revision-history-css' => '0e8eb855',
'differential-revision-list-css' => 'f3c47d33',
'differential-table-of-contents-css' => 'ae4b7a55',
- 'diffusion-history-css' => 'de70e348',
+ 'diffusion-history-css' => 'cc283766',
'diffusion-icons-css' => 'a6a1e2ba',
'diffusion-readme-css' => '18bd3910',
'diffusion-source-css' => '750add59',
@@ -867,7 +867,7 @@
'phui-segment-bar-view-css' => 'b1d1b892',
'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => 'd5263e49',
- 'phui-tag-view-css' => '3fa7765e',
+ 'phui-tag-view-css' => '93b084cf',
'phui-theme-css' => '9f261c6b',
'phui-timeline-view-css' => '313c7f22',
'phui-two-column-view-css' => 'ce9fa0b7',
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -333,6 +333,7 @@
$tag = id(new PHUITagView())
->setName($commit)
->setColor(PHUITagView::COLOR_INDIGO)
+ ->setBorder(PHUITagView::BORDER_NONE)
->setType(PHUITagView::TYPE_SHADE);
return $tag;
diff --git a/src/applications/diffusion/view/DiffusionHistoryListView.php b/src/applications/diffusion/view/DiffusionHistoryListView.php
--- a/src/applications/diffusion/view/DiffusionHistoryListView.php
+++ b/src/applications/diffusion/view/DiffusionHistoryListView.php
@@ -110,7 +110,7 @@
->setType(PHUITagView::TYPE_SHADE)
->setColor(PHUITagView::COLOR_BLUE)
->setHref('/D'.$d_id)
- ->addClass('diffusion-differential-tag')
+ ->setBorder(PHUITagView::BORDER_NONE)
->setSlimShady(true);
}
}
@@ -155,6 +155,7 @@
->setName($commit_name)
->setType(PHUITagView::TYPE_SHADE)
->setColor(PHUITagView::COLOR_INDIGO)
+ ->setBorder(PHUITagView::BORDER_NONE)
->setSlimShady(true);
$item = id(new PHUIObjectItemView())
diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php
--- a/src/view/phui/PHUITagView.php
+++ b/src/view/phui/PHUITagView.php
@@ -28,6 +28,8 @@
const COLOR_OBJECT = 'object';
const COLOR_PERSON = 'person';
+ const BORDER_NONE = 'border-none';
+
private $type;
private $href;
private $name;
@@ -40,6 +42,7 @@
private $icon;
private $shade;
private $slimShady;
+ private $border;
public function setType($type) {
$this->type = $type;
@@ -104,6 +107,11 @@
return $this;
}
+ public function setBorder($border) {
+ $this->border = $border;
+ return $this;
+ }
+
public function setIcon($icon) {
$this->icon = $icon;
return $this;
@@ -142,6 +150,10 @@
$classes[] = 'phui-tag-icon-view';
}
+ if ($this->border) {
+ $classes[] = 'phui-tag-'.$this->border;
+ }
+
if ($this->phid) {
Javelin::initBehavior('phui-hovercards');
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-history.css b/webroot/rsrc/css/application/diffusion/diffusion-history.css
--- a/webroot/rsrc/css/application/diffusion/diffusion-history.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-history.css
@@ -7,14 +7,6 @@
font-size: {$biggerfontsize};
}
-.diffusion-history-list .phui-oi-attribute .phui-tag-core {
- border-color: transparent;
-}
-
-.diffusion-history-list .phui-oi-attribute .phui-tag-indigo a {
- color: {$indigo};
-}
-
.diffusion-history-message {
background-color: {$bluebackground};
padding: 16px;
@@ -35,8 +27,3 @@
.diffusion-history-list .diffusion-differential-tag {
margin-left: 4px;
}
-
-a.phui-tag-view:hover.diffusion-differential-tag .phui-tag-core {
- border-color: transparent;
- text-decoration: underline;
-}
diff --git a/webroot/rsrc/css/phui/phui-tag-view.css b/webroot/rsrc/css/phui/phui-tag-view.css
--- a/webroot/rsrc/css/phui/phui-tag-view.css
+++ b/webroot/rsrc/css/phui/phui-tag-view.css
@@ -154,6 +154,15 @@
margin: 0 4px 2px 0;
}
+.phui-tag-view.phui-tag-border-none .phui-tag-core {
+ border-color: transparent;
+}
+
+a.phui-tag-view:hover.phui-tag-border-none .phui-tag-core {
+ border-color: transparent !important;
+ text-decoration: underline;
+}
+
/* - Shaded Tags ---------------------------------------------------------------

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 3:55 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7682492
Default Alt Text
D18074.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility