Page MenuHomePhabricator
Files F18380238

D11974.id28860.diff
No OneTemporary
Actions

D11974.id28860.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' => '1a530a25',
'core.pkg.js' => 'a77025a1',
'darkconsole.pkg.js' => '8ab24e01',
- 'differential.pkg.css' => '4c3242f8',
+ 'differential.pkg.css' => 'd8866ed8',
'differential.pkg.js' => '7b5a4aa4',
'diffusion.pkg.css' => '591664fa',
'diffusion.pkg.js' => 'bfc0737b',
@@ -55,7 +55,7 @@
'rsrc/css/application/dashboard/dashboard.css' => '17937d22',
'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
- 'rsrc/css/application/differential/changeset-view.css' => 'a7781046',
+ 'rsrc/css/application/differential/changeset-view.css' => 'b600950c',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
'rsrc/css/application/differential/revision-comment.css' => '48186045',
@@ -519,7 +519,7 @@
'conpherence-notification-css' => '04a6e10a',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '3d575438',
- 'differential-changeset-view-css' => 'a7781046',
+ 'differential-changeset-view-css' => 'b600950c',
'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'f2441746',
'differential-results-table-css' => '181aa9d9',
diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
@@ -3,6 +3,8 @@
abstract class DifferentialChangesetHTMLRenderer
extends DifferentialChangesetRenderer {
+ abstract protected function getRendererTableClass();
+
protected function renderChangeTypeHeader($force) {
$changeset = $this->getChangeset();
@@ -392,10 +394,16 @@
return null;
}
+ $classes = array();
+ $classes[] = 'differential-diff';
+ $classes[] = 'remarkup-code';
+ $classes[] = 'PhabricatorMonospaced';
+ $classes[] = $this->getRendererTableClass();
+
return javelin_tag(
'table',
array(
- 'class' => 'differential-diff remarkup-code PhabricatorMonospaced',
+ 'class' => implode(' ', $classes),
'sigil' => 'differential-diff',
),
array(
diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
@@ -7,6 +7,10 @@
return true;
}
+ protected function getRendererTableClass() {
+ return 'diff-1up';
+ }
+
protected function renderColgroup() {
return phutil_tag('colgroup', array(), array(
phutil_tag('col', array('class' => 'num')),
diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
@@ -7,6 +7,10 @@
return false;
}
+ protected function getRendererTableClass() {
+ return 'diff-2up';
+ }
+
protected function renderColgroup() {
return phutil_tag('colgroup', array(), array(
phutil_tag('col', array('class' => 'num')),
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -17,18 +17,25 @@
.differential-diff {
background: #fff;
width: 100%;
- min-width: 780px;
border-top: 1px solid {$lightblueborder};
border-bottom: 1px solid {$lightblueborder};
table-layout: fixed;
}
+.differential-diff.diff-2up {
+ min-width: 780px;
+}
+
.differential-diff col.num {
width: 45px;
}
-.differential-diff col.left,
-.differential-diff col.right {
+.device .differential-diff.diff-1up col.num {
+ width: 32px;
+}
+
+.differential-diff.diff-2up col.left,
+.differential-diff.diff-2up col.right {
width: 49.25%;
}
@@ -48,6 +55,10 @@
line-height: 16px;
}
+.device .differential-diff td {
+ padding: 0 4px 1px;
+}
+
.differential-diff td .zwsp {
position: absolute;
width: 0;
@@ -163,8 +174,6 @@
background: #f3f6ff;
}
-
-
.differential-diff td.show-more,
.differential-diff th.show-context-line,
.differential-diff td.show-context,
@@ -175,6 +184,13 @@
border-bottom: 1px solid {$thinblueborder};
}
+.device .differential-diff td.show-more,
+.device .differential-diff th.show-context-line,
+.device .differential-diff td.show-context,
+.device .differential-diff td.differential-shield {
+ padding: 6px 0;
+}
+
.differential-diff td.show-more,
.differential-diff td.differential-shield {
font: {$basefont};

File Metadata

Mime Type
text/plain
Expires
Aug 29 2025, 5:27 PM (5 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8924596
Default Alt Text
D11974.id28860.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility