revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-28 15:38:19 +01:00
Code Issues Releases Wiki Activity

Make some dropdown CSS more specific

Browse source 
Summary:
Dropdowns have some `span` rules and such currently. Give them class-based rules instead.

(This allows me to add another <span> to menu items later on without it picking up silly styles.)

Test Plan: In a future diff, added menu items with additional <span>s inside them.

Reviewers: btrahan, chad

Reviewed By: chad

CC: chad, aran

Differential Revision: https://secure.phabricator.com/D7294
This commit is contained in:
epriestley 2013-10-14 11:50:05 -07:00
parent 994823524b
commit 181aff8556
3 changed files with 104 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
src/__celerity_resource_map__.php
View file

@ -3299,7 +3299,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-menu-item' => 'phabricator-menu-item' =>
array( array(
'uri' => '/res/345d4168/rsrc/js/core/DropdownMenuItem.js', 'uri' => '/res/e810b0a1/rsrc/js/core/DropdownMenuItem.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -3770,7 +3770,7 @@ celerity_register_resource_map(array(
), ),
'phui-button-css' => 'phui-button-css' =>
array( array(
'uri' => '/res/3be4ec80/rsrc/css/phui/phui-button.css', 'uri' => '/res/3b21ca84/rsrc/css/phui/phui-button.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -4257,7 +4257,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'b2f506ea' => '0ed58ed4' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -4306,10 +4306,10 @@ celerity_register_resource_map(array(
41 => 'phabricator-tag-view-css', 41 => 'phabricator-tag-view-css',
42 => 'phui-list-view-css', 42 => 'phui-list-view-css',
), ),
'uri' => '/res/pkg/b2f506ea/core.pkg.css', 'uri' => '/res/pkg/0ed58ed4/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'3a57ca2f' => '9eabd244' =>
array( array(
'name' => 'core.pkg.js', 'name' => 'core.pkg.js',
'symbols' => 'symbols' =>
@ -4354,7 +4354,7 @@ celerity_register_resource_map(array(
37 => 'javelin-color', 37 => 'javelin-color',
38 => 'javelin-fx', 38 => 'javelin-fx',
), ),
'uri' => '/res/pkg/3a57ca2f/core.pkg.js', 'uri' => '/res/pkg/9eabd244/core.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'4ccfeb47' => '4ccfeb47' =>
@ -4498,15 +4498,15 @@ celerity_register_resource_map(array(
), ),
'reverse' => 'reverse' =>
array( array(
'aphront-dialog-view-css' => 'b2f506ea', 'aphront-dialog-view-css' => '0ed58ed4',
'aphront-error-view-css' => 'b2f506ea', 'aphront-error-view-css' => '0ed58ed4',
'aphront-list-filter-view-css' => 'b2f506ea', 'aphront-list-filter-view-css' => '0ed58ed4',
'aphront-pager-view-css' => 'b2f506ea', 'aphront-pager-view-css' => '0ed58ed4',
'aphront-panel-view-css' => 'b2f506ea', 'aphront-panel-view-css' => '0ed58ed4',
'aphront-table-view-css' => 'b2f506ea', 'aphront-table-view-css' => '0ed58ed4',
'aphront-tokenizer-control-css' => 'b2f506ea', 'aphront-tokenizer-control-css' => '0ed58ed4',
'aphront-tooltip-css' => 'b2f506ea', 'aphront-tooltip-css' => '0ed58ed4',
'aphront-typeahead-control-css' => 'b2f506ea', 'aphront-typeahead-control-css' => '0ed58ed4',
'differential-changeset-view-css' => '4dc2311c', 'differential-changeset-view-css' => '4dc2311c',
'differential-core-view-css' => '4dc2311c', 'differential-core-view-css' => '4dc2311c',
'differential-inline-comment-editor' => '5e9e5c4e', 'differential-inline-comment-editor' => '5e9e5c4e',
@ -4520,18 +4520,18 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '4dc2311c', 'differential-table-of-contents-css' => '4dc2311c',
'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => 'b2f506ea', 'global-drag-and-drop-css' => '0ed58ed4',
'inline-comment-summary-css' => '4dc2311c', 'inline-comment-summary-css' => '4dc2311c',
'javelin-aphlict' => '3a57ca2f', 'javelin-aphlict' => '9eabd244',
'javelin-behavior' => '9564fa17', 'javelin-behavior' => '9564fa17',
'javelin-behavior-aphlict-dropdown' => '3a57ca2f', 'javelin-behavior-aphlict-dropdown' => '9eabd244',
'javelin-behavior-aphlict-listen' => '3a57ca2f', 'javelin-behavior-aphlict-listen' => '9eabd244',
'javelin-behavior-aphront-basic-tokenizer' => '3a57ca2f', 'javelin-behavior-aphront-basic-tokenizer' => '9eabd244',
'javelin-behavior-aphront-drag-and-drop-textarea' => '5e9e5c4e', 'javelin-behavior-aphront-drag-and-drop-textarea' => '5e9e5c4e',
'javelin-behavior-aphront-form-disable-on-submit' => '3a57ca2f', 'javelin-behavior-aphront-form-disable-on-submit' => '9eabd244',
'javelin-behavior-audit-preview' => '96909266', 'javelin-behavior-audit-preview' => '96909266',
'javelin-behavior-dark-console' => '4ccfeb47', 'javelin-behavior-dark-console' => '4ccfeb47',
'javelin-behavior-device' => '3a57ca2f', 'javelin-behavior-device' => '9eabd244',
'javelin-behavior-differential-accept-with-errors' => '5e9e5c4e', 'javelin-behavior-differential-accept-with-errors' => '5e9e5c4e',
'javelin-behavior-differential-add-reviewers-and-ccs' => '5e9e5c4e', 'javelin-behavior-differential-add-reviewers-and-ccs' => '5e9e5c4e',
'javelin-behavior-differential-comment-jump' => '5e9e5c4e', 'javelin-behavior-differential-comment-jump' => '5e9e5c4e',
@ -4547,37 +4547,37 @@ celerity_register_resource_map(array(
'javelin-behavior-diffusion-commit-graph' => '96909266', 'javelin-behavior-diffusion-commit-graph' => '96909266',
'javelin-behavior-diffusion-pull-lastmodified' => '96909266', 'javelin-behavior-diffusion-pull-lastmodified' => '96909266',
'javelin-behavior-error-log' => '4ccfeb47', 'javelin-behavior-error-log' => '4ccfeb47',
'javelin-behavior-global-drag-and-drop' => '3a57ca2f', 'javelin-behavior-global-drag-and-drop' => '9eabd244',
'javelin-behavior-history-install' => '3a57ca2f', 'javelin-behavior-history-install' => '9eabd244',
'javelin-behavior-konami' => '3a57ca2f', 'javelin-behavior-konami' => '9eabd244',
'javelin-behavior-lightbox-attachments' => '3a57ca2f', 'javelin-behavior-lightbox-attachments' => '9eabd244',
'javelin-behavior-load-blame' => '5e9e5c4e', 'javelin-behavior-load-blame' => '5e9e5c4e',
'javelin-behavior-maniphest-batch-selector' => '0a694954', 'javelin-behavior-maniphest-batch-selector' => '0a694954',
'javelin-behavior-maniphest-subpriority-editor' => '0a694954', 'javelin-behavior-maniphest-subpriority-editor' => '0a694954',
'javelin-behavior-maniphest-transaction-controls' => '0a694954', 'javelin-behavior-maniphest-transaction-controls' => '0a694954',
'javelin-behavior-maniphest-transaction-expand' => '0a694954', 'javelin-behavior-maniphest-transaction-expand' => '0a694954',
'javelin-behavior-maniphest-transaction-preview' => '0a694954', 'javelin-behavior-maniphest-transaction-preview' => '0a694954',
'javelin-behavior-phabricator-active-nav' => '3a57ca2f', 'javelin-behavior-phabricator-active-nav' => '9eabd244',
'javelin-behavior-phabricator-autofocus' => '3a57ca2f', 'javelin-behavior-phabricator-autofocus' => '9eabd244',
'javelin-behavior-phabricator-gesture' => '3a57ca2f', 'javelin-behavior-phabricator-gesture' => '9eabd244',
'javelin-behavior-phabricator-hovercards' => '3a57ca2f', 'javelin-behavior-phabricator-hovercards' => '9eabd244',
'javelin-behavior-phabricator-keyboard-shortcuts' => '3a57ca2f', 'javelin-behavior-phabricator-keyboard-shortcuts' => '9eabd244',
'javelin-behavior-phabricator-nav' => '3a57ca2f', 'javelin-behavior-phabricator-nav' => '9eabd244',
'javelin-behavior-phabricator-object-selector' => '5e9e5c4e', 'javelin-behavior-phabricator-object-selector' => '5e9e5c4e',
'javelin-behavior-phabricator-oncopy' => '3a57ca2f', 'javelin-behavior-phabricator-oncopy' => '9eabd244',
'javelin-behavior-phabricator-remarkup-assist' => '3a57ca2f', 'javelin-behavior-phabricator-remarkup-assist' => '9eabd244',
'javelin-behavior-phabricator-reveal-content' => '3a57ca2f', 'javelin-behavior-phabricator-reveal-content' => '9eabd244',
'javelin-behavior-phabricator-search-typeahead' => '3a57ca2f', 'javelin-behavior-phabricator-search-typeahead' => '9eabd244',
'javelin-behavior-phabricator-tooltips' => '3a57ca2f', 'javelin-behavior-phabricator-tooltips' => '9eabd244',
'javelin-behavior-phabricator-watch-anchor' => '3a57ca2f', 'javelin-behavior-phabricator-watch-anchor' => '9eabd244',
'javelin-behavior-refresh-csrf' => '3a57ca2f', 'javelin-behavior-refresh-csrf' => '9eabd244',
'javelin-behavior-repository-crossreference' => '5e9e5c4e', 'javelin-behavior-repository-crossreference' => '5e9e5c4e',
'javelin-behavior-toggle-class' => '3a57ca2f', 'javelin-behavior-toggle-class' => '9eabd244',
'javelin-behavior-workflow' => '3a57ca2f', 'javelin-behavior-workflow' => '9eabd244',
'javelin-color' => '3a57ca2f', 'javelin-color' => '9eabd244',
'javelin-dom' => '9564fa17', 'javelin-dom' => '9564fa17',
'javelin-event' => '9564fa17', 'javelin-event' => '9564fa17',
'javelin-fx' => '3a57ca2f', 'javelin-fx' => '9eabd244',
'javelin-history' => '9564fa17', 'javelin-history' => '9564fa17',
'javelin-install' => '9564fa17', 'javelin-install' => '9564fa17',
'javelin-json' => '9564fa17', 'javelin-json' => '9564fa17',
@ -4595,56 +4595,56 @@ celerity_register_resource_map(array(
'javelin-util' => '9564fa17', 'javelin-util' => '9564fa17',
'javelin-vector' => '9564fa17', 'javelin-vector' => '9564fa17',
'javelin-workflow' => '9564fa17', 'javelin-workflow' => '9564fa17',
'lightbox-attachment-css' => 'b2f506ea', 'lightbox-attachment-css' => '0ed58ed4',
'maniphest-task-summary-css' => '49898640', 'maniphest-task-summary-css' => '49898640',
'phabricator-action-list-view-css' => 'b2f506ea', 'phabricator-action-list-view-css' => '0ed58ed4',
'phabricator-application-launch-view-css' => 'b2f506ea', 'phabricator-application-launch-view-css' => '0ed58ed4',
'phabricator-busy' => '3a57ca2f', 'phabricator-busy' => '9eabd244',
'phabricator-content-source-view-css' => '4dc2311c', 'phabricator-content-source-view-css' => '4dc2311c',
'phabricator-core-css' => 'b2f506ea', 'phabricator-core-css' => '0ed58ed4',
'phabricator-crumbs-view-css' => 'b2f506ea', 'phabricator-crumbs-view-css' => '0ed58ed4',
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e', 'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
'phabricator-dropdown-menu' => '3a57ca2f', 'phabricator-dropdown-menu' => '9eabd244',
'phabricator-file-upload' => '3a57ca2f', 'phabricator-file-upload' => '9eabd244',
'phabricator-filetree-view-css' => 'b2f506ea', 'phabricator-filetree-view-css' => '0ed58ed4',
'phabricator-flag-css' => 'b2f506ea', 'phabricator-flag-css' => '0ed58ed4',
'phabricator-hovercard' => '3a57ca2f', 'phabricator-hovercard' => '9eabd244',
'phabricator-jump-nav' => 'b2f506ea', 'phabricator-jump-nav' => '0ed58ed4',
'phabricator-keyboard-shortcut' => '3a57ca2f', 'phabricator-keyboard-shortcut' => '9eabd244',
'phabricator-keyboard-shortcut-manager' => '3a57ca2f', 'phabricator-keyboard-shortcut-manager' => '9eabd244',
'phabricator-main-menu-view' => 'b2f506ea', 'phabricator-main-menu-view' => '0ed58ed4',
'phabricator-menu-item' => '3a57ca2f', 'phabricator-menu-item' => '9eabd244',
'phabricator-nav-view-css' => 'b2f506ea', 'phabricator-nav-view-css' => '0ed58ed4',
'phabricator-notification' => '3a57ca2f', 'phabricator-notification' => '9eabd244',
'phabricator-notification-css' => 'b2f506ea', 'phabricator-notification-css' => '0ed58ed4',
'phabricator-notification-menu-css' => 'b2f506ea', 'phabricator-notification-menu-css' => '0ed58ed4',
'phabricator-object-selector-css' => '4dc2311c', 'phabricator-object-selector-css' => '4dc2311c',
'phabricator-phtize' => '3a57ca2f', 'phabricator-phtize' => '9eabd244',
'phabricator-prefab' => '3a57ca2f', 'phabricator-prefab' => '9eabd244',
'phabricator-project-tag-css' => '49898640', 'phabricator-project-tag-css' => '49898640',
'phabricator-remarkup-css' => 'b2f506ea', 'phabricator-remarkup-css' => '0ed58ed4',
'phabricator-shaped-request' => '5e9e5c4e', 'phabricator-shaped-request' => '5e9e5c4e',
'phabricator-side-menu-view-css' => 'b2f506ea', 'phabricator-side-menu-view-css' => '0ed58ed4',
'phabricator-standard-page-view' => 'b2f506ea', 'phabricator-standard-page-view' => '0ed58ed4',
'phabricator-tag-view-css' => 'b2f506ea', 'phabricator-tag-view-css' => '0ed58ed4',
'phabricator-textareautils' => '3a57ca2f', 'phabricator-textareautils' => '9eabd244',
'phabricator-tooltip' => '3a57ca2f', 'phabricator-tooltip' => '9eabd244',
'phabricator-transaction-view-css' => 'b2f506ea', 'phabricator-transaction-view-css' => '0ed58ed4',
'phabricator-zindex-css' => 'b2f506ea', 'phabricator-zindex-css' => '0ed58ed4',
'phui-button-css' => 'b2f506ea', 'phui-button-css' => '0ed58ed4',
'phui-form-css' => 'b2f506ea', 'phui-form-css' => '0ed58ed4',
'phui-form-view-css' => 'b2f506ea', 'phui-form-view-css' => '0ed58ed4',
'phui-header-view-css' => 'b2f506ea', 'phui-header-view-css' => '0ed58ed4',
'phui-icon-view-css' => 'b2f506ea', 'phui-icon-view-css' => '0ed58ed4',
'phui-list-view-css' => 'b2f506ea', 'phui-list-view-css' => '0ed58ed4',
'phui-object-item-list-view-css' => 'b2f506ea', 'phui-object-item-list-view-css' => '0ed58ed4',
'phui-property-list-view-css' => 'b2f506ea', 'phui-property-list-view-css' => '0ed58ed4',
'phui-spacing-css' => 'b2f506ea', 'phui-spacing-css' => '0ed58ed4',
'sprite-apps-large-css' => 'b2f506ea', 'sprite-apps-large-css' => '0ed58ed4',
'sprite-gradient-css' => 'b2f506ea', 'sprite-gradient-css' => '0ed58ed4',
'sprite-icons-css' => 'b2f506ea', 'sprite-icons-css' => '0ed58ed4',
'sprite-menu-css' => 'b2f506ea', 'sprite-menu-css' => '0ed58ed4',
'sprite-status-css' => 'b2f506ea', 'sprite-status-css' => '0ed58ed4',
'syntax-highlighting-css' => 'b2f506ea', 'syntax-highlighting-css' => '0ed58ed4',
), ),
)); ));

9
webroot/rsrc/css/phui/phui-button.css
View file

@ -156,8 +156,7 @@ button.link:hover {
border-bottom-color: {$greyborder}; border-bottom-color: {$greyborder};
} }
.dropdown-menu-frame a, .dropdown-menu-frame .dropdown-menu-item {
.dropdown-menu-frame span {
display: block; display: block;
padding: 2px 10px; padding: 2px 10px;
clear: both; clear: both;
@ -166,11 +165,11 @@ button.link:hover {
white-space: nowrap; white-space: nowrap;
} }
.dropdown-menu-frame span { .dropdown-menu-frame .dropdown-menu-item-disabled {
color: {$lightgreytext}; color: {$lightgreytext};
} }
.dropdown-menu-frame span.phui-icon-view { .dropdown-menu-frame .phui-icon-view {
display: inline-block; display: inline-block;
padding: 0; padding: 0;
margin: 2px 8px -2px 4px; margin: 2px 8px -2px 4px;
@ -192,7 +191,7 @@ a.policy-control span.phui-icon-view {
left: 7px; left: 7px;
} }
.dropdown-menu-frame .phabricator-menu-item-selected { .dropdown-menu-frame .dropdown-menu-item-selected {
background: {$lightblue}; background: {$lightblue};
} }

13
webroot/rsrc/js/core/DropdownMenuItem.js
View file

@ -17,10 +17,21 @@ JX.install('PhabricatorMenuItem', {
_action : null, _action : null,
render : function() { render : function() {
var classes = [];
classes.push('dropdown-menu-item');
if (this.getSelected()) {
classes.push('dropdown-menu-item-selected');
}
if (this.getDisabled()) {
classes.push('dropdown-menu-item-disabled');
}
var attrs = { var attrs = {
href: this.getHref(), href: this.getHref(),
meta: { item: this }, meta: { item: this },
className: this.getSelected() ? 'phabricator-menu-item-selected' : null className: classes.join(' ')
}; };
if (this.getDisabled()) { if (this.getDisabled()) {