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

Minor, fix more merge failures.

Browse source
This commit is contained in:
epriestley 2012-12-07 13:49:39 -08:00
parent 54fe74d621
commit c6ca409a03
3 changed files with 74 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
src/__celerity_resource_map__.php
View file

@ -1625,7 +1625,7 @@ celerity_register_resource_map(array(
),
'javelin-behavior-phabricator-nav' =>
array(
'uri' => '/res/d14679f9/rsrc/js/application/core/behavior-phabricator-nav.js',
'uri' => '/res/ef90e83f/rsrc/js/application/core/behavior-phabricator-nav.js',
'type' => 'js',
'requires' =>
array(
@ -2621,7 +2621,7 @@ celerity_register_resource_map(array(
),
'phabricator-main-menu-view' =>
array(
'uri' => '/res/a29dfe00/rsrc/css/application/base/main-menu-view.css',
'uri' => '/res/f322cd13/rsrc/css/application/base/main-menu-view.css',
'type' => 'css',
'requires' =>
array(
@ -3227,7 +3227,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
'eab98f7c' =>
'b492c8db' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@ -3265,10 +3265,10 @@ celerity_register_resource_map(array(
30 => 'phabricator-filetree-view-css',
31 => 'phabricator-nav-view-css',
),
'uri' => '/res/pkg/eab98f7c/core.pkg.css',
'uri' => '/res/pkg/b492c8db/core.pkg.css',
'type' => 'css',
),
'5b0b945b' =>
'5673560d' =>
array(
'name' => 'core.pkg.js',
'symbols' =>
@ -3305,7 +3305,7 @@ celerity_register_resource_map(array(
29 => 'phabricator-textareautils',
30 => 'phabricator-file-upload',
),
'uri' => '/res/pkg/5b0b945b/core.pkg.js',
'uri' => '/res/pkg/5673560d/core.pkg.js',
'type' => 'js',
),
'3c5efda9' =>
@ -3453,20 +3453,20 @@ celerity_register_resource_map(array(
'reverse' =>
array(
'aphront-attached-file-view-css' => '7839ae2d',
'aphront-crumbs-view-css' => 'eab98f7c',
'aphront-dialog-view-css' => 'eab98f7c',
'aphront-error-view-css' => 'eab98f7c',
'aphront-form-view-css' => 'eab98f7c',
'aphront-crumbs-view-css' => 'b492c8db',
'aphront-dialog-view-css' => 'b492c8db',
'aphront-error-view-css' => 'b492c8db',
'aphront-form-view-css' => 'b492c8db',
'aphront-headsup-action-list-view-css' => 'c904bbee',
'aphront-headsup-view-css' => 'eab98f7c',
'aphront-list-filter-view-css' => 'eab98f7c',
'aphront-pager-view-css' => 'eab98f7c',
'aphront-panel-view-css' => 'eab98f7c',
'aphront-side-nav-view-css' => 'eab98f7c',
'aphront-table-view-css' => 'eab98f7c',
'aphront-tokenizer-control-css' => 'eab98f7c',
'aphront-tooltip-css' => 'eab98f7c',
'aphront-typeahead-control-css' => 'eab98f7c',
'aphront-headsup-view-css' => 'b492c8db',
'aphront-list-filter-view-css' => 'b492c8db',
'aphront-pager-view-css' => 'b492c8db',
'aphront-panel-view-css' => 'b492c8db',
'aphront-side-nav-view-css' => 'b492c8db',
'aphront-table-view-css' => 'b492c8db',
'aphront-tokenizer-control-css' => 'b492c8db',
'aphront-tooltip-css' => 'b492c8db',
'aphront-typeahead-control-css' => 'b492c8db',
'differential-changeset-view-css' => 'c904bbee',
'differential-core-view-css' => 'c904bbee',
'differential-inline-comment-editor' => '7ecd31fa',
@ -3481,18 +3481,18 @@ celerity_register_resource_map(array(
'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88',
'inline-comment-summary-css' => 'c904bbee',
'javelin-aphlict' => '5b0b945b',
'javelin-aphlict' => '5673560d',
'javelin-behavior' => 'db6d724d',
'javelin-behavior-aphlict-dropdown' => '5b0b945b',
'javelin-behavior-aphlict-listen' => '5b0b945b',
'javelin-behavior-aphront-basic-tokenizer' => '5b0b945b',
'javelin-behavior-aphlict-dropdown' => '5673560d',
'javelin-behavior-aphlict-listen' => '5673560d',
'javelin-behavior-aphront-basic-tokenizer' => '5673560d',
'javelin-behavior-aphront-drag-and-drop' => '7ecd31fa',
'javelin-behavior-aphront-drag-and-drop-textarea' => '7ecd31fa',
'javelin-behavior-aphront-form-disable-on-submit' => '5b0b945b',
'javelin-behavior-aphront-form-disable-on-submit' => '5673560d',
'javelin-behavior-audit-preview' => '5e68be89',
'javelin-behavior-dark-console' => '3c5efda9',
'javelin-behavior-dark-console-ajax' => '3c5efda9',
'javelin-behavior-device' => '5b0b945b',
'javelin-behavior-device' => '5673560d',
'javelin-behavior-differential-accept-with-errors' => '7ecd31fa',
'javelin-behavior-differential-add-reviewers-and-ccs' => '7ecd31fa',
'javelin-behavior-differential-comment-jump' => '7ecd31fa',
@ -3508,27 +3508,27 @@ celerity_register_resource_map(array(
'javelin-behavior-diffusion-commit-graph' => '5e68be89',
'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89',
'javelin-behavior-error-log' => '3c5efda9',
'javelin-behavior-konami' => '5b0b945b',
'javelin-behavior-lightbox-attachments' => '5b0b945b',
'javelin-behavior-konami' => '5673560d',
'javelin-behavior-lightbox-attachments' => '5673560d',
'javelin-behavior-maniphest-batch-selector' => '7707de41',
'javelin-behavior-maniphest-subpriority-editor' => '7707de41',
'javelin-behavior-maniphest-transaction-controls' => '7707de41',
'javelin-behavior-maniphest-transaction-expand' => '7707de41',
'javelin-behavior-maniphest-transaction-preview' => '7707de41',
'javelin-behavior-phabricator-active-nav' => '5b0b945b',
'javelin-behavior-phabricator-autofocus' => '5b0b945b',
'javelin-behavior-phabricator-keyboard-shortcuts' => '5b0b945b',
'javelin-behavior-phabricator-nav' => '5b0b945b',
'javelin-behavior-phabricator-active-nav' => '5673560d',
'javelin-behavior-phabricator-autofocus' => '5673560d',
'javelin-behavior-phabricator-keyboard-shortcuts' => '5673560d',
'javelin-behavior-phabricator-nav' => '5673560d',
'javelin-behavior-phabricator-object-selector' => '7ecd31fa',
'javelin-behavior-phabricator-oncopy' => '5b0b945b',
'javelin-behavior-phabricator-remarkup-assist' => '5b0b945b',
'javelin-behavior-phabricator-search-typeahead' => '5b0b945b',
'javelin-behavior-phabricator-tooltips' => '5b0b945b',
'javelin-behavior-phabricator-watch-anchor' => '5b0b945b',
'javelin-behavior-refresh-csrf' => '5b0b945b',
'javelin-behavior-phabricator-oncopy' => '5673560d',
'javelin-behavior-phabricator-remarkup-assist' => '5673560d',
'javelin-behavior-phabricator-search-typeahead' => '5673560d',
'javelin-behavior-phabricator-tooltips' => '5673560d',
'javelin-behavior-phabricator-watch-anchor' => '5673560d',
'javelin-behavior-refresh-csrf' => '5673560d',
'javelin-behavior-repository-crossreference' => '7ecd31fa',
'javelin-behavior-toggle-class' => '5b0b945b',
'javelin-behavior-workflow' => '5b0b945b',
'javelin-behavior-toggle-class' => '5673560d',
'javelin-behavior-workflow' => '5673560d',
'javelin-dom' => 'db6d724d',
'javelin-event' => 'db6d724d',
'javelin-install' => 'db6d724d',
@ -3547,42 +3547,42 @@ celerity_register_resource_map(array(
'javelin-util' => 'db6d724d',
'javelin-vector' => 'db6d724d',
'javelin-workflow' => 'db6d724d',
'lightbox-attachment-css' => 'eab98f7c',
'lightbox-attachment-css' => 'b492c8db',
'maniphest-task-summary-css' => '7839ae2d',
'maniphest-transaction-detail-css' => '7839ae2d',
'phabricator-app-buttons-css' => 'eab98f7c',
'phabricator-busy' => '5b0b945b',
'phabricator-app-buttons-css' => 'b492c8db',
'phabricator-busy' => '5673560d',
'phabricator-content-source-view-css' => 'c904bbee',
'phabricator-core-buttons-css' => 'eab98f7c',
'phabricator-core-css' => 'eab98f7c',
'phabricator-directory-css' => 'eab98f7c',
'phabricator-core-buttons-css' => 'b492c8db',
'phabricator-core-css' => 'b492c8db',
'phabricator-directory-css' => 'b492c8db',
'phabricator-drag-and-drop-file-upload' => '7ecd31fa',
'phabricator-dropdown-menu' => '5b0b945b',
'phabricator-file-upload' => '5b0b945b',
'phabricator-filetree-view-css' => 'eab98f7c',
'phabricator-flag-css' => 'eab98f7c',
'phabricator-form-view-css' => 'eab98f7c',
'phabricator-header-view-css' => 'eab98f7c',
'phabricator-jump-nav' => 'eab98f7c',
'phabricator-keyboard-shortcut' => '5b0b945b',
'phabricator-keyboard-shortcut-manager' => '5b0b945b',
'phabricator-main-menu-view' => 'eab98f7c',
'phabricator-menu-item' => '5b0b945b',
'phabricator-nav-view-css' => 'eab98f7c',
'phabricator-notification' => '5b0b945b',
'phabricator-notification-css' => 'eab98f7c',
'phabricator-notification-menu-css' => 'eab98f7c',
'phabricator-dropdown-menu' => '5673560d',
'phabricator-file-upload' => '5673560d',
'phabricator-filetree-view-css' => 'b492c8db',
'phabricator-flag-css' => 'b492c8db',
'phabricator-form-view-css' => 'b492c8db',
'phabricator-header-view-css' => 'b492c8db',
'phabricator-jump-nav' => 'b492c8db',
'phabricator-keyboard-shortcut' => '5673560d',
'phabricator-keyboard-shortcut-manager' => '5673560d',
'phabricator-main-menu-view' => 'b492c8db',
'phabricator-menu-item' => '5673560d',
'phabricator-nav-view-css' => 'b492c8db',
'phabricator-notification' => '5673560d',
'phabricator-notification-css' => 'b492c8db',
'phabricator-notification-menu-css' => 'b492c8db',
'phabricator-object-selector-css' => 'c904bbee',
'phabricator-paste-file-upload' => '5b0b945b',
'phabricator-prefab' => '5b0b945b',
'phabricator-paste-file-upload' => '5673560d',
'phabricator-prefab' => '5673560d',
'phabricator-project-tag-css' => '7839ae2d',
'phabricator-remarkup-css' => 'eab98f7c',
'phabricator-remarkup-css' => 'b492c8db',
'phabricator-shaped-request' => '7ecd31fa',
'phabricator-standard-page-view' => 'eab98f7c',
'phabricator-textareautils' => '5b0b945b',
'phabricator-tooltip' => '5b0b945b',
'phabricator-transaction-view-css' => 'eab98f7c',
'sprite-icon-css' => 'eab98f7c',
'syntax-highlighting-css' => 'eab98f7c',
'phabricator-standard-page-view' => 'b492c8db',
'phabricator-textareautils' => '5673560d',
'phabricator-tooltip' => '5673560d',
'phabricator-transaction-view-css' => 'b492c8db',
'sprite-icon-css' => 'b492c8db',
'syntax-highlighting-css' => 'b492c8db',
),
));

5
webroot/rsrc/css/application/base/main-menu-view.css
View file

@ -20,6 +20,10 @@
min-height: 44px;
}
.device-desktop .phabricator-main-menu {
height: 44px;
}
.phabricator-main-menu a:hover {
text-decoration: none;
}
@ -355,6 +359,7 @@ a:hover .phabricator-main-search-typeahead-result .result-type {
.device .phabricator-core-menu-expanded .phabricator-core-menu {
display: block;
padding-top: 44px;
}
.device .phabricator-core-menu .phabricator-menu-item-type-link {

2
webroot/rsrc/js/application/core/behavior-phabricator-nav.js
View file

@ -134,8 +134,6 @@ JX.behavior('phabricator-nav', function(config) {
drag.style.left = '';
}
content.style.marginLeft = '';
select_button(2);
});
});