Page MenuHomePhabricator
Files F13184845

D12702.id30497.diff
No OneTemporary
Actions

D12702.id30497.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
@@ -10,7 +10,7 @@
'core.pkg.css' => 'ca3f6a60',
'core.pkg.js' => '3331b919',
'darkconsole.pkg.js' => 'e7393ebb',
- 'differential.pkg.css' => '0a253fbe',
+ 'differential.pkg.css' => '13312972',
'differential.pkg.js' => '3cfa26f9',
'diffusion.pkg.css' => '591664fa',
'diffusion.pkg.js' => '0115b37c',
@@ -58,7 +58,7 @@
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
'rsrc/css/application/differential/changeset-view.css' => 'e19cfd6e',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
- 'rsrc/css/application/differential/phui-inline-comment.css' => '48766bbe',
+ 'rsrc/css/application/differential/phui-inline-comment.css' => 'df8fbd63',
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
'rsrc/css/application/differential/revision-comment.css' => '024dda6b',
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
@@ -795,7 +795,7 @@
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
'phui-info-view-css' => 'c6f0aef8',
- 'phui-inline-comment-view-css' => '48766bbe',
+ 'phui-inline-comment-view-css' => 'df8fbd63',
'phui-list-view-css' => '2e25ebfb',
'phui-object-box-css' => '7d160002',
'phui-object-item-list-view-css' => '9db65899',
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -128,12 +128,11 @@
if ($ghost) {
if ($ghost['new']) {
$ghosticon = 'fa-fast-forward';
- $reason = pht('View forward comment');
+ $reason = pht('View forward revision');
} else {
$ghosticon = 'fa-fast-backward';
- $reason = pht('View previous comment');
+ $reason = pht('View previous revision');
}
- $ghost_id = celerity_generate_unique_node_id();
$ghost_icon = id(new PHUIIconView())
->setIconFont($ghosticon)
@@ -143,16 +142,11 @@
'tip' => $reason,
'size' => 300,
));
- $ghost_tag = javelin_tag(
+ $ghost_tag = phutil_tag(
'a',
array(
'class' => 'ghost-icon',
- 'sigil' => 'jx-toggle-class',
- 'meta' => array(
- 'map' => array(
- $ghost_id => 'ghost-is-expanded',
- ),
- ),
+ 'href' => '#', // TODO ask @epriestley
),
$ghost_icon);
$classes[] = 'inline-comment-ghost';
@@ -415,7 +409,6 @@
'class' => $classes,
'sigil' => $sigil,
'meta' => $metadata,
- 'id' => $ghost_id,
),
array(
phutil_tag_div('differential-inline-comment-head grouped', array(
diff --git a/webroot/rsrc/css/application/differential/phui-inline-comment.css b/webroot/rsrc/css/application/differential/phui-inline-comment.css
--- a/webroot/rsrc/css/application/differential/phui-inline-comment.css
+++ b/webroot/rsrc/css/application/differential/phui-inline-comment.css
@@ -47,7 +47,7 @@
font-weight: bold;
color: {$darkbluetext};
border-bottom: 1px solid {$sh-lightyellowborder};
- padding: 4px 5px 2px 12px;
+ padding: 4px 5px 4px 12px;
background-color: {$sh-yellowbackground};
}
@@ -415,7 +415,7 @@
}
.ghost-icon .phui-icon-view {
- padding: 7px 7px 8px;
+ padding: 8px 7px;
font-size: 15px;
color: {$lightbluetext};
}
@@ -424,23 +424,8 @@
color: {$sky};
}
-.inline-comment-ghost .differential-inline-comment-content {
- display: none;
-}
-
-.inline-comment-ghost.ghost-is-expanded .differential-inline-comment-content {
- display: block;
-}
-
.differential-inline-comment.inline-comment-ghost
.differential-inline-comment-head {
- border-bottom-color: transparent;
- position: relative;
-}
-
-.differential-inline-comment.inline-comment-ghost.ghost-is-expanded
- .differential-inline-comment-head {
- border-bottom-color: {$thinblueborder};
position: relative;
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 12:51 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6281239
Default Alt Text
D12702.id30497.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility