diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 87cc4719a5..f25b2f6211 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -936,7 +936,7 @@ celerity_register_resource_map(array( ), 'conpherence-message-pane-css' => array( - 'uri' => '/res/ff25351b/rsrc/css/application/conpherence/message-pane.css', + 'uri' => '/res/9b319b64/rsrc/css/application/conpherence/message-pane.css', 'type' => 'css', 'requires' => array( @@ -1301,19 +1301,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/js/application/phortune/behavior-balanced-payment-form.js', ), - 'javelin-behavior-conpherence-drag-and-drop-photo' => - array( - 'uri' => '/res/9e3eb1cd/rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js', - 'type' => 'js', - 'requires' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-dom', - 2 => 'javelin-workflow', - 3 => 'phabricator-drag-and-drop-file-upload', - ), - 'disk' => '/rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js', - ), 'javelin-behavior-conpherence-menu' => array( 'uri' => '/res/2bffa665/rsrc/js/application/conpherence/behavior-menu.js', @@ -3006,7 +2993,7 @@ celerity_register_resource_map(array( ), 'phabricator-dropdown-menu' => array( - 'uri' => '/res/efe00353/rsrc/js/core/DropdownMenu.js', + 'uri' => '/res/a248b7f4/rsrc/js/core/DropdownMenu.js', 'type' => 'js', 'requires' => array( @@ -4046,7 +4033,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/190fa563/core.pkg.css', 'type' => 'css', ), - 'eb74a94b' => + '77faef00' => array( 'name' => 'core.pkg.js', 'symbols' => @@ -4089,7 +4076,7 @@ celerity_register_resource_map(array( 35 => 'phabricator-hovercard', 36 => 'javelin-behavior-phabricator-hovercards', ), - 'uri' => '/res/pkg/eb74a94b/core.pkg.js', + 'uri' => '/res/pkg/77faef00/core.pkg.js', 'type' => 'js', ), '4ccfeb47' => @@ -4262,17 +4249,17 @@ celerity_register_resource_map(array( 'diffusion-icons-css' => 'c8ce2d88', 'global-drag-and-drop-css' => '190fa563', 'inline-comment-summary-css' => 'dd27a69b', - 'javelin-aphlict' => 'eb74a94b', + 'javelin-aphlict' => '77faef00', 'javelin-behavior' => 'c1359b5d', - 'javelin-behavior-aphlict-dropdown' => 'eb74a94b', - 'javelin-behavior-aphlict-listen' => 'eb74a94b', - 'javelin-behavior-aphront-basic-tokenizer' => 'eb74a94b', + 'javelin-behavior-aphlict-dropdown' => '77faef00', + 'javelin-behavior-aphlict-listen' => '77faef00', + 'javelin-behavior-aphront-basic-tokenizer' => '77faef00', 'javelin-behavior-aphront-drag-and-drop' => '9488bb69', 'javelin-behavior-aphront-drag-and-drop-textarea' => '9488bb69', - 'javelin-behavior-aphront-form-disable-on-submit' => 'eb74a94b', + 'javelin-behavior-aphront-form-disable-on-submit' => '77faef00', 'javelin-behavior-audit-preview' => '96909266', 'javelin-behavior-dark-console' => '4ccfeb47', - 'javelin-behavior-device' => 'eb74a94b', + 'javelin-behavior-device' => '77faef00', 'javelin-behavior-differential-accept-with-errors' => '9488bb69', 'javelin-behavior-differential-add-reviewers-and-ccs' => '9488bb69', 'javelin-behavior-differential-comment-jump' => '9488bb69', @@ -4288,33 +4275,33 @@ celerity_register_resource_map(array( 'javelin-behavior-diffusion-commit-graph' => '96909266', 'javelin-behavior-diffusion-pull-lastmodified' => '96909266', 'javelin-behavior-error-log' => '4ccfeb47', - 'javelin-behavior-global-drag-and-drop' => 'eb74a94b', - 'javelin-behavior-history-install' => 'eb74a94b', - 'javelin-behavior-konami' => 'eb74a94b', - 'javelin-behavior-lightbox-attachments' => 'eb74a94b', + 'javelin-behavior-global-drag-and-drop' => '77faef00', + 'javelin-behavior-history-install' => '77faef00', + 'javelin-behavior-konami' => '77faef00', + 'javelin-behavior-lightbox-attachments' => '77faef00', 'javelin-behavior-load-blame' => '9488bb69', 'javelin-behavior-maniphest-batch-selector' => '1621e522', 'javelin-behavior-maniphest-subpriority-editor' => '1621e522', 'javelin-behavior-maniphest-transaction-controls' => '1621e522', 'javelin-behavior-maniphest-transaction-expand' => '1621e522', 'javelin-behavior-maniphest-transaction-preview' => '1621e522', - 'javelin-behavior-phabricator-active-nav' => 'eb74a94b', - 'javelin-behavior-phabricator-autofocus' => 'eb74a94b', - 'javelin-behavior-phabricator-gesture' => 'eb74a94b', - 'javelin-behavior-phabricator-hovercards' => 'eb74a94b', - 'javelin-behavior-phabricator-keyboard-shortcuts' => 'eb74a94b', - 'javelin-behavior-phabricator-nav' => 'eb74a94b', + 'javelin-behavior-phabricator-active-nav' => '77faef00', + 'javelin-behavior-phabricator-autofocus' => '77faef00', + 'javelin-behavior-phabricator-gesture' => '77faef00', + 'javelin-behavior-phabricator-hovercards' => '77faef00', + 'javelin-behavior-phabricator-keyboard-shortcuts' => '77faef00', + 'javelin-behavior-phabricator-nav' => '77faef00', 'javelin-behavior-phabricator-object-selector' => '9488bb69', - 'javelin-behavior-phabricator-oncopy' => 'eb74a94b', - 'javelin-behavior-phabricator-remarkup-assist' => 'eb74a94b', - 'javelin-behavior-phabricator-reveal-content' => 'eb74a94b', - 'javelin-behavior-phabricator-search-typeahead' => 'eb74a94b', - 'javelin-behavior-phabricator-tooltips' => 'eb74a94b', - 'javelin-behavior-phabricator-watch-anchor' => 'eb74a94b', - 'javelin-behavior-refresh-csrf' => 'eb74a94b', + 'javelin-behavior-phabricator-oncopy' => '77faef00', + 'javelin-behavior-phabricator-remarkup-assist' => '77faef00', + 'javelin-behavior-phabricator-reveal-content' => '77faef00', + 'javelin-behavior-phabricator-search-typeahead' => '77faef00', + 'javelin-behavior-phabricator-tooltips' => '77faef00', + 'javelin-behavior-phabricator-watch-anchor' => '77faef00', + 'javelin-behavior-refresh-csrf' => '77faef00', 'javelin-behavior-repository-crossreference' => '9488bb69', - 'javelin-behavior-toggle-class' => 'eb74a94b', - 'javelin-behavior-workflow' => 'eb74a94b', + 'javelin-behavior-toggle-class' => '77faef00', + 'javelin-behavior-workflow' => '77faef00', 'javelin-dom' => 'c1359b5d', 'javelin-event' => 'c1359b5d', 'javelin-history' => 'c1359b5d', @@ -4339,33 +4326,33 @@ celerity_register_resource_map(array( 'maniphest-transaction-detail-css' => '6b1fccc6', 'phabricator-action-list-view-css' => '190fa563', 'phabricator-application-launch-view-css' => '190fa563', - 'phabricator-busy' => 'eb74a94b', + 'phabricator-busy' => '77faef00', 'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-core-buttons-css' => '190fa563', 'phabricator-core-css' => '190fa563', 'phabricator-crumbs-view-css' => '190fa563', 'phabricator-directory-css' => '190fa563', 'phabricator-drag-and-drop-file-upload' => '9488bb69', - 'phabricator-dropdown-menu' => 'eb74a94b', - 'phabricator-file-upload' => 'eb74a94b', + 'phabricator-dropdown-menu' => '77faef00', + 'phabricator-file-upload' => '77faef00', 'phabricator-filetree-view-css' => '190fa563', 'phabricator-flag-css' => '190fa563', 'phabricator-form-view-css' => '190fa563', 'phabricator-header-view-css' => '190fa563', - 'phabricator-hovercard' => 'eb74a94b', + 'phabricator-hovercard' => '77faef00', 'phabricator-jump-nav' => '190fa563', - 'phabricator-keyboard-shortcut' => 'eb74a94b', - 'phabricator-keyboard-shortcut-manager' => 'eb74a94b', + 'phabricator-keyboard-shortcut' => '77faef00', + 'phabricator-keyboard-shortcut-manager' => '77faef00', 'phabricator-main-menu-view' => '190fa563', - 'phabricator-menu-item' => 'eb74a94b', + 'phabricator-menu-item' => '77faef00', 'phabricator-nav-view-css' => '190fa563', - 'phabricator-notification' => 'eb74a94b', + 'phabricator-notification' => '77faef00', 'phabricator-notification-css' => '190fa563', 'phabricator-notification-menu-css' => '190fa563', 'phabricator-object-item-list-view-css' => '190fa563', 'phabricator-object-selector-css' => 'dd27a69b', - 'phabricator-phtize' => 'eb74a94b', - 'phabricator-prefab' => 'eb74a94b', + 'phabricator-phtize' => '77faef00', + 'phabricator-prefab' => '77faef00', 'phabricator-project-tag-css' => '6b1fccc6', 'phabricator-property-list-view-css' => '190fa563', 'phabricator-remarkup-css' => '190fa563', @@ -4373,8 +4360,8 @@ celerity_register_resource_map(array( 'phabricator-side-menu-view-css' => '190fa563', 'phabricator-standard-page-view' => '190fa563', 'phabricator-tag-view-css' => '190fa563', - 'phabricator-textareautils' => 'eb74a94b', - 'phabricator-tooltip' => 'eb74a94b', + 'phabricator-textareautils' => '77faef00', + 'phabricator-tooltip' => '77faef00', 'phabricator-transaction-view-css' => '190fa563', 'phabricator-zindex-css' => '190fa563', 'phui-form-css' => '190fa563', diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index e9cebe9739..95e66d8364 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -79,7 +79,13 @@ } .conpherence-message-pane .phabricator-transaction-view { - margin: 10px 0 10px 15px; + margin: 5px 15px; + background-size: 35px; + min-height: auto; +} + +.device-phone .conpherence-message-pane .phabricator-transaction-view { + margin: 0 10px 0 0; } .conpherence-message-pane .phabricator-transaction-detail { @@ -87,24 +93,44 @@ margin-left: 45px; } +.device-phone .conpherence-message-pane .phabricator-transaction-detail { + min-height: auto; +} + +.conpherence-message-pane .conpherence-edited { + color: #888; + margin: 0; +} + +.device-phone .conpherence-message-pane .conpherence-edited { + color: #888; + margin: 0 10px; +} + +.conpherence-message-pane .conpherence-edited .phabricator-transaction-content { + padding: 0 0 5px 45px; + font-style: italic; +} + +.device-phone .conpherence-message-pane .conpherence-edited .phabricator-transaction-content { + padding: 0 0 5px 35px; +} + .conpherence-message-pane .phabricator-transaction-info, .conpherence-message-pane .phabricator-content-source-view { color: #b7b7b7; + line-height: 16px; } .conpherence-message-pane .phabricator-transaction-header, .conpherence-message-pane .phabricator-transaction-info, .conpherence-message-pane .phabricator-transaction-content { background: none; + padding: 0; } .conpherence-message-pane .phabricator-transaction-content { - padding-top: 0; -} - -.conpherence-message-pane .conpherence-edited .phabricator-transaction-content { - padding: 0 1em 0 1em; - margin-top: -4px; + padding: 2px 0 8px 0; } .conpherence-message-pane .aphront-form-control {