From e5b3d0331974e26523e2c4077886abf62dfc3557 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 26 May 2017 17:23:25 -0700 Subject: [PATCH] Fix lightbox circle icons Summary: These are unfortunatly manually built so I missed them in testing circle view changes. Test Plan: Test lightbox, conpherence, uiexamples Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D18036 --- resources/celerity/map.php | 24 +++++++++---------- src/view/page/PhabricatorStandardPageView.php | 3 ++- .../js/core/behavior-lightbox-attachments.js | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index a2119c98a4..241f9acf08 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -10,7 +10,7 @@ return array( 'conpherence.pkg.css' => 'ff161f2d', 'conpherence.pkg.js' => 'b5b51108', 'core.pkg.css' => '19f6f61f', - 'core.pkg.js' => '21d34805', + 'core.pkg.js' => '1475bd91', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '7d4cfa59', 'differential.pkg.js' => '1d120743', @@ -501,7 +501,7 @@ return array( 'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64', 'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0', 'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0', - 'rsrc/js/core/behavior-lightbox-attachments.js' => 'a5c57c24', + 'rsrc/js/core/behavior-lightbox-attachments.js' => '560f41da', 'rsrc/js/core/behavior-line-linker.js' => '1499a8cb', 'rsrc/js/core/behavior-more.js' => 'a80d0378', 'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f', @@ -644,7 +644,7 @@ return array( 'javelin-behavior-history-install' => '7ee2b591', 'javelin-behavior-icon-composer' => '8499b6ab', 'javelin-behavior-launch-icon-composer' => '48086888', - 'javelin-behavior-lightbox-attachments' => 'a5c57c24', + 'javelin-behavior-lightbox-attachments' => '560f41da', 'javelin-behavior-line-chart' => 'e4232876', 'javelin-behavior-load-blame' => '42126667', 'javelin-behavior-maniphest-batch-editor' => '782ab6e7', @@ -1332,6 +1332,15 @@ return array( 'javelin-vector', 'javelin-dom', ), + '560f41da' => array( + 'javelin-behavior', + 'javelin-stratcom', + 'javelin-dom', + 'javelin-mask', + 'javelin-util', + 'phuix-icon-view', + 'phabricator-busy', + ), '58dea2fa' => array( 'javelin-install', 'javelin-util', @@ -1708,15 +1717,6 @@ return array( 'javelin-uri', 'phabricator-notification', ), - 'a5c57c24' => array( - 'javelin-behavior', - 'javelin-stratcom', - 'javelin-dom', - 'javelin-mask', - 'javelin-util', - 'phuix-icon-view', - 'phabricator-busy', - ), 'a6b98425' => array( 'javelin-behavior', 'javelin-dom', diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index ffa82ab1b9..a138d077b5 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -268,7 +268,8 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView } $icon = id(new PHUIIconView()) - ->setIcon('fa-download'); + ->setIcon('fa-download') + ->addClass('phui-icon-circle-icon'); $lightbox_id = celerity_generate_unique_node_id(); $download_form = phabricator_form( $user, diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js index 929222f2f9..b9ea0dd8db 100644 --- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js +++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js @@ -169,7 +169,7 @@ JX.behavior('lightbox-attachments', function (config) { ); var commentIcon = new JX.PHUIXIconView() - .setIcon('fa-comments') + .setIcon('fa-comments phui-icon-circle-icon') .getNode(); var commentButton = JX.$N('a', @@ -181,7 +181,7 @@ JX.behavior('lightbox-attachments', function (config) { commentIcon ); var closeIcon = new JX.PHUIXIconView() - .setIcon('fa-times') + .setIcon('fa-times phui-icon-circle-icon') .getNode(); var closeButton = JX.$N('a',