mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 00:42:41 +01:00
Clean up css race condition in Conpherence notification menu
Summary: Depending on when packages loaded, this CSS sometimes gets overwritten. Make it more specific and always present. Test Plan: Reload a lot Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16657
This commit is contained in:
parent
1d00bc9180
commit
3ce3ce957d
3 changed files with 5 additions and 6 deletions
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
return array(
|
||||
'names' => array(
|
||||
'conpherence.pkg.css' => '1bc6cd0d',
|
||||
'conpherence.pkg.css' => 'ffcfadf9',
|
||||
'conpherence.pkg.js' => '11f3e07e',
|
||||
'core.pkg.css' => '3fa66cb3',
|
||||
'core.pkg.js' => '30185d95',
|
||||
|
@ -50,7 +50,7 @@ return array(
|
|||
'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
|
||||
'rsrc/css/application/conpherence/menu.css' => '78c7b811',
|
||||
'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02',
|
||||
'rsrc/css/application/conpherence/notification.css' => '65dd0e79',
|
||||
'rsrc/css/application/conpherence/notification.css' => '965db05b',
|
||||
'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56',
|
||||
'rsrc/css/application/conpherence/transaction.css' => '46253e19',
|
||||
'rsrc/css/application/conpherence/update.css' => '53bc527a',
|
||||
|
@ -622,7 +622,7 @@ return array(
|
|||
'conpherence-header-pane-css' => '517de9fe',
|
||||
'conpherence-menu-css' => '78c7b811',
|
||||
'conpherence-message-pane-css' => '0d7dff02',
|
||||
'conpherence-notification-css' => '65dd0e79',
|
||||
'conpherence-notification-css' => '965db05b',
|
||||
'conpherence-participant-pane-css' => '7bba0b56',
|
||||
'conpherence-thread-manager' => '01774ab2',
|
||||
'conpherence-transaction-css' => '46253e19',
|
||||
|
|
|
@ -6,6 +6,7 @@ final class ConpherenceNotificationPanelController
|
|||
public function handleRequest(AphrontRequest $request) {
|
||||
$user = $request->getUser();
|
||||
$conpherences = array();
|
||||
require_celerity_resource('conpherence-notification-css');
|
||||
$unread_status = ConpherenceParticipationStatus::BEHIND;
|
||||
|
||||
$participant_data = id(new ConpherenceParticipantQuery())
|
||||
|
@ -25,7 +26,6 @@ final class ConpherenceNotificationPanelController
|
|||
}
|
||||
|
||||
if ($conpherences) {
|
||||
require_celerity_resource('conpherence-notification-css');
|
||||
// re-order the conpherences based on participation data
|
||||
$conpherences = array_select_keys(
|
||||
$conpherences, array_keys($participant_data));
|
||||
|
|
|
@ -2,8 +2,7 @@
|
|||
* @provides conpherence-notification-css
|
||||
*/
|
||||
|
||||
/* kill styles on phabricator-notification */
|
||||
.conpherence-notification {
|
||||
.phabricator-notification.conpherence-notification {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue