From 5fef5e56e2dc9c448028dfab6d22dab8de7c8aea Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 24 Sep 2025 19:16:32 +0200 Subject: [PATCH] Celerity: Add Base Yellow variables for button theming consistency Summary: The Basic, Red, and Green "Simple Button" on http://phorge.localhost/uiexample/view/PHUIButtonExample/ have their separate "Base" colors defined. The Yellow "Simple Button" instead takes its colors from "Shade Yellow" and thus shares them. That makes skinning harder and more surprising when you try to have a usable Dark Mode (fixing Dark Mode is a separate patch though). Refs T15056 Test Plan: * Look at the four colors in `phui-button-simple.css`, compare variables, and dramatically raise an eyebrow * Go to http://phorge.localhost/settings/panel/display/ and set `Accessibility` to `Default (Use Standard Colors)` * Look at Yellow Buttons. They are shy but some sometimes they graze on http://phorge.localhost/uiexample/view/PHUIButtonExample/ so watch out! Reviewers: O1 Blessed Committers, mainframe98 Reviewed By: O1 Blessed Committers, mainframe98 Subscribers: mainframe98, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15056 Differential Revision: https://we.phorge.it/D26374 --- resources/celerity/map.php | 12 ++++++------ .../postprocessor/CelerityDarkModePostprocessor.php | 6 ++++++ .../postprocessor/CelerityDefaultPostprocessor.php | 6 ++++++ webroot/rsrc/css/phui/button/phui-button-simple.css | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 869fee368b..6aeff7995d 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => 'beb13d57', 'conpherence.pkg.js' => '020aebcf', - 'core.pkg.css' => '1bfee9a9', + 'core.pkg.css' => 'b6b76664', 'core.pkg.js' => '83580d78', 'dark-console.pkg.js' => '187792c2', 'differential.pkg.css' => '77189aae', @@ -116,7 +116,7 @@ return array( 'rsrc/css/fuel/fuel-menu.css' => '21f5d199', 'rsrc/css/layout/phabricator-source-code-view.css' => 'e994d13f', 'rsrc/css/phui/button/phui-button-bar.css' => 'a4aa75c4', - 'rsrc/css/phui/button/phui-button-simple.css' => '1ff278aa', + 'rsrc/css/phui/button/phui-button-simple.css' => 'a9da7b2a', 'rsrc/css/phui/button/phui-button.css' => 'bca9bfe3', 'rsrc/css/phui/calendar/phui-calendar-day.css' => '9597d706', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'ccd7e4e2', @@ -775,7 +775,7 @@ return array( 'phui-bulk-editor-css' => '374d5e30', 'phui-button-bar-css' => 'a4aa75c4', 'phui-button-css' => 'bca9bfe3', - 'phui-button-simple-css' => '1ff278aa', + 'phui-button-simple-css' => 'a9da7b2a', 'phui-calendar-css' => '5dfee96b', 'phui-calendar-day-css' => '9597d706', 'phui-calendar-list-css' => 'ccd7e4e2', @@ -1014,9 +1014,6 @@ return array( 'javelin-behavior', 'javelin-dom', ), - '1ff278aa' => array( - 'phui-button-css', - ), '202a2e85' => array( 'javelin-install', 'javelin-reactornode', @@ -1776,6 +1773,9 @@ return array( 'javelin-util', 'phabricator-notification-css', ), + 'a9da7b2a' => array( + 'phui-button-css', + ), 'aa371860' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/celerity/postprocessor/CelerityDarkModePostprocessor.php b/src/applications/celerity/postprocessor/CelerityDarkModePostprocessor.php index f1ccd4f1f6..1c47cf7ce5 100644 --- a/src/applications/celerity/postprocessor/CelerityDarkModePostprocessor.php +++ b/src/applications/celerity/postprocessor/CelerityDarkModePostprocessor.php @@ -104,6 +104,12 @@ final class CelerityDarkModePostprocessor 'redtext' => '#802b2b', 'lightredbackground' => '#f5e1e1', + // Base Yellow + 'lightyellowborder' => '#dbdbbd', + 'yellowborder' => '#b9b988', + 'yellowtext' => '#72723c', + 'lightyellowbackground' => '#ededde', + // Base Violet 'lightvioletborder' => '#cfbddb', 'violetborder' => '#b589ba', diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php index 2bc562609d..524024ed91 100644 --- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php +++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php @@ -117,6 +117,12 @@ final class CelerityDefaultPostprocessor 'redtext' => '#802b2b', 'lightredbackground' => '#f5e1e1', + // Base Yellow + 'lightyellowborder' => '#dbdbbd', + 'yellowborder' => '#b9b988', + 'yellowtext' => '#72723c', + 'lightyellowbackground' => '#ededde', + // Base Violet 'lightvioletborder' => '#cfbddb', 'violetborder' => '#b589ba', diff --git a/webroot/rsrc/css/phui/button/phui-button-simple.css b/webroot/rsrc/css/phui/button/phui-button-simple.css index 1ebfea47d5..a9ea1248c3 100644 --- a/webroot/rsrc/css/phui/button/phui-button-simple.css +++ b/webroot/rsrc/css/phui/button/phui-button-simple.css @@ -94,7 +94,7 @@ input[type="submit"].phui-button-simple.button-yellow, a.phui-button-simple.button-yellow, a.phui-button-simple.button-yellow:visited { background-color: {$sh-yellowbackground}; - color: {$sh-yellowtext}; + color: {$yellowtext}; border: 1px solid {$sh-yellowborder}; } @@ -102,7 +102,7 @@ button.phui-button-simple.button-yellow .phui-icon-view, input[type="submit"].phui-button-simple.button-yellow .phui-icon-view, a.phui-button-simple.button-yellow .phui-icon-view, a.phui-button-simple.button-yellow:visited .phui-icon-view { - color: {$sh-yellowicon}; + color: {$yellowtext}; } a.button.phui-button-simple.button-yellow:hover, -- 2.51.2