Page MenuHomePhabricator
Files F14082992

D17269.diff
No OneTemporary
Actions

D17269.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
@@ -12,7 +12,7 @@
'core.pkg.css' => '12c56bd9',
'core.pkg.js' => '1fa7c0c5',
'darkconsole.pkg.js' => 'e7393ebb',
- 'differential.pkg.css' => '4815647b',
+ 'differential.pkg.css' => '90b30783',
'differential.pkg.js' => 'ddfeb49b',
'diffusion.pkg.css' => '91c5d3a6',
'diffusion.pkg.js' => '84c8f8fd',
@@ -58,7 +58,7 @@
'rsrc/css/application/dashboard/dashboard.css' => '0921c307',
'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
- 'rsrc/css/application/differential/changeset-view.css' => '6a9bdf9c',
+ 'rsrc/css/application/differential/changeset-view.css' => '41af6d25',
'rsrc/css/application/differential/core.css' => '5b7b8ff4',
'rsrc/css/application/differential/phui-inline-comment.css' => 'be663c95',
'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -572,7 +572,7 @@
'conpherence-thread-manager' => 'c8b5ee6f',
'conpherence-transaction-css' => '85129c68',
'd3' => 'a11a5ff2',
- 'differential-changeset-view-css' => '6a9bdf9c',
+ 'differential-changeset-view-css' => '41af6d25',
'differential-core-view-css' => '5b7b8ff4',
'differential-inline-comment-editor' => '2e3f9738',
'differential-revision-add-comment-css' => 'c47f8c40',
@@ -1166,6 +1166,9 @@
'javelin-dom',
'javelin-reactor-dom',
),
+ '41af6d25' => array(
+ 'phui-inline-comment-view-css',
+ ),
42126667 => array(
'javelin-behavior',
'javelin-dom',
@@ -1386,9 +1389,6 @@
'69adf288' => array(
'javelin-install',
),
- '6a9bdf9c' => array(
- 'phui-inline-comment-view-css',
- ),
'6ad39b6f' => array(
'javelin-install',
'javelin-event',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -235,6 +235,7 @@
'CelerityPhysicalResourcesTestCase' => 'applications/celerity/resources/__tests__/CelerityPhysicalResourcesTestCase.php',
'CelerityPostprocessor' => 'applications/celerity/postprocessor/CelerityPostprocessor.php',
'CelerityPostprocessorTestCase' => 'applications/celerity/__tests__/CelerityPostprocessorTestCase.php',
+ 'CelerityRedGreenPostprocessor' => 'applications/celerity/postprocessor/CelerityRedGreenPostprocessor.php',
'CelerityResourceController' => 'applications/celerity/controller/CelerityResourceController.php',
'CelerityResourceGraph' => 'applications/celerity/CelerityResourceGraph.php',
'CelerityResourceMap' => 'applications/celerity/CelerityResourceMap.php',
@@ -4911,6 +4912,7 @@
'CelerityPhysicalResourcesTestCase' => 'PhabricatorTestCase',
'CelerityPostprocessor' => 'Phobject',
'CelerityPostprocessorTestCase' => 'PhabricatorTestCase',
+ 'CelerityRedGreenPostprocessor' => 'CelerityPostprocessor',
'CelerityResourceController' => 'PhabricatorController',
'CelerityResourceGraph' => 'AbstractDirectedGraph',
'CelerityResourceMap' => 'Phobject',
diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
--- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
+++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
@@ -193,10 +193,10 @@
'sh-disabledbackground' => '#f3f3f3',
// Diffs
- 'new-background' => '#eaffea',
- 'new-bright' => '#a6f3a6',
- 'old-background' => '#ffecec',
- 'old-bright' => '#f8cbcb',
+ 'new-background' => 'rgba(151, 234, 151, .3)',
+ 'new-bright' => 'rgba(151, 234, 151, .6)',
+ 'old-background' => 'rgba(251, 175, 175, .3)',
+ 'old-bright' => 'rgba(251, 175, 175, .7)',
'move-background' => '#fdf5d4',
'copy-background' => '#f1c40f',
diff --git a/src/applications/celerity/postprocessor/CelerityRedGreenPostprocessor.php b/src/applications/celerity/postprocessor/CelerityRedGreenPostprocessor.php
new file mode 100644
--- /dev/null
+++ b/src/applications/celerity/postprocessor/CelerityRedGreenPostprocessor.php
@@ -0,0 +1,23 @@
+<?php
+
+final class CelerityRedGreenPostprocessor
+ extends CelerityPostprocessor {
+
+ public function getPostprocessorKey() {
+ return 'redgreen';
+ }
+
+ public function getPostprocessorName() {
+ return pht('Use Red/Green (Deuteranopia) Colors');
+ }
+
+ public function buildVariables() {
+ return array(
+ 'new-background' => 'rgba(152, 207, 235, .15)',
+ 'new-bright' => 'rgba(152, 207, 235, .35)',
+ 'old-background' => 'rgba(250, 212, 175, .3)',
+ 'old-bright' => 'rgba(250, 212, 175, .55)',
+ );
+ }
+
+}
diff --git a/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetOneUpMailRenderer.php
@@ -51,6 +51,10 @@
protected function renderPrimitives(array $primitives, $rows) {
$out = array();
+ $viewer = $this->getUser();
+ $old_bright = $viewer->getCSSValue('old-bright');
+ $new_bright = $viewer->getCSSValue('new-bright');
+
$context_style = array(
'background: #F7F7F7;',
'color: #74777D;',
@@ -72,13 +76,13 @@
if ($is_old) {
if ($p['htype']) {
- $style = 'background: #ffd0d0;';
+ $style = "background: {$old_bright};";
} else {
$style = null;
}
} else {
if ($p['htype']) {
- $style = 'background: #d0ffd0;';
+ $style = "background: {$new_bright};";
} else {
$style = null;
}
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1580,4 +1580,22 @@
return $this;
}
+
+ public function getCSSValue($variable_key) {
+ $preference = PhabricatorAccessibilitySetting::SETTINGKEY;
+ $key = $this->getUserSetting($preference);
+
+ $postprocessor = CelerityPostprocessor::getPostprocessor($key);
+ $variables = $postprocessor->getVariables();
+
+ if (!isset($variables[$variable_key])) {
+ throw new Exception(
+ pht(
+ 'Unknown CSS variable "%s"!',
+ $variable_key));
+ }
+
+ return $variables[$variable_key];
+ }
+
}
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php
@@ -19,17 +19,21 @@
public function renderForMail() {
$diff = $this->buildDiff();
+ $viewer = $this->getViewer();
+ $old_bright = $viewer->getCSSValue('old-bright');
+ $new_bright = $viewer->getCSSValue('new-bright');
+
$old_styles = array(
'padding: 0 2px;',
'color: #333333;',
- 'background: #f8cbcb;',
+ "background: {$old_bright};",
);
$old_styles = implode(' ', $old_styles);
$new_styles = array(
'padding: 0 2px;',
'color: #333333;',
- 'background: #a6f3a6;',
+ "background: {$new_bright};",
);
$new_styles = implode(' ', $new_styles);

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 2:27 AM (17 h, 33 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6780682
Default Alt Text
D17269.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility