Update Conpherence CSS to handle multiple edits better
Summary: Fixes T7655. We'll set tighter spacing around edit clusters. Also darkened up the date marker and remove unused `phabricator-transaction-view` CSS that was still scattered around the site. Test Plan: Test a full and column multi-edit spam. Visited Ponder and Diffusion, noticed no issues using those apps. Grepped for other users of `phabricator-transaction-view` Reviewers: epriestley, btrahan Reviewed By: btrahan Subscribers: Korvin, epriestley Maniphest Tasks: T7655 Differential Revision: https://secure.phabricator.com/D12148
This commit is contained in:
		| @@ -7,10 +7,10 @@ | |||||||
|  */ |  */ | ||||||
| return array( | return array( | ||||||
|   'names' => array( |   'names' => array( | ||||||
|     'core.pkg.css' => '02ae106f', |     'core.pkg.css' => 'eca3f2e7', | ||||||
|     'core.pkg.js' => '75599122', |     'core.pkg.js' => '75599122', | ||||||
|     'darkconsole.pkg.js' => '8ab24e01', |     'darkconsole.pkg.js' => '8ab24e01', | ||||||
|     'differential.pkg.css' => '217276e8', |     'differential.pkg.css' => '5a0b221c', | ||||||
|     'differential.pkg.js' => 'e324301d', |     'differential.pkg.js' => 'e324301d', | ||||||
|     'diffusion.pkg.css' => '591664fa', |     'diffusion.pkg.css' => '591664fa', | ||||||
|     'diffusion.pkg.js' => 'bfc0737b', |     'diffusion.pkg.js' => 'bfc0737b', | ||||||
| @@ -29,7 +29,7 @@ return array( | |||||||
|     'rsrc/css/aphront/table-view.css' => 'b22b7216', |     'rsrc/css/aphront/table-view.css' => 'b22b7216', | ||||||
|     'rsrc/css/aphront/tokenizer.css' => '82ce2142', |     'rsrc/css/aphront/tokenizer.css' => '82ce2142', | ||||||
|     'rsrc/css/aphront/tooltip.css' => '4099b97e', |     'rsrc/css/aphront/tooltip.css' => '4099b97e', | ||||||
|     'rsrc/css/aphront/transaction.css' => '5d0cae25', |     'rsrc/css/aphront/transaction.css' => '042fc4bb', | ||||||
|     'rsrc/css/aphront/two-column.css' => '16ab3ad2', |     'rsrc/css/aphront/two-column.css' => '16ab3ad2', | ||||||
|     'rsrc/css/aphront/typeahead.css' => '0e403212', |     'rsrc/css/aphront/typeahead.css' => '0e403212', | ||||||
|     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', |     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', | ||||||
| @@ -44,9 +44,9 @@ return array( | |||||||
|     'rsrc/css/application/config/config-welcome.css' => '6abd79be', |     'rsrc/css/application/config/config-welcome.css' => '6abd79be', | ||||||
|     'rsrc/css/application/config/setup-issue.css' => '22270af2', |     'rsrc/css/application/config/setup-issue.css' => '22270af2', | ||||||
|     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', |     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', | ||||||
|     'rsrc/css/application/conpherence/durable-column.css' => 'a27580c5', |     'rsrc/css/application/conpherence/durable-column.css' => 'e5a70c22', | ||||||
|     'rsrc/css/application/conpherence/menu.css' => '9b37a261', |     'rsrc/css/application/conpherence/menu.css' => '9b37a261', | ||||||
|     'rsrc/css/application/conpherence/message-pane.css' => 'e78e9d3c', |     'rsrc/css/application/conpherence/message-pane.css' => '0c4dfb6f', | ||||||
|     'rsrc/css/application/conpherence/notification.css' => '04a6e10a', |     'rsrc/css/application/conpherence/notification.css' => '04a6e10a', | ||||||
|     'rsrc/css/application/conpherence/update.css' => '1099a660', |     'rsrc/css/application/conpherence/update.css' => '1099a660', | ||||||
|     'rsrc/css/application/conpherence/widget-pane.css' => '1979ee8c', |     'rsrc/css/application/conpherence/widget-pane.css' => '1979ee8c', | ||||||
| @@ -58,7 +58,7 @@ return array( | |||||||
|     'rsrc/css/application/differential/changeset-view.css' => 'c5d1e738', |     'rsrc/css/application/differential/changeset-view.css' => 'c5d1e738', | ||||||
|     'rsrc/css/application/differential/core.css' => '7ac3cabc', |     'rsrc/css/application/differential/core.css' => '7ac3cabc', | ||||||
|     'rsrc/css/application/differential/results-table.css' => '181aa9d9', |     'rsrc/css/application/differential/results-table.css' => '181aa9d9', | ||||||
|     'rsrc/css/application/differential/revision-comment.css' => '48186045', |     'rsrc/css/application/differential/revision-comment.css' => '64603753', | ||||||
|     'rsrc/css/application/differential/revision-history.css' => '0e8eb855', |     'rsrc/css/application/differential/revision-history.css' => '0e8eb855', | ||||||
|     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33', |     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33', | ||||||
|     'rsrc/css/application/differential/table-of-contents.css' => '63f3ef4a', |     'rsrc/css/application/differential/table-of-contents.css' => '63f3ef4a', | ||||||
| @@ -92,7 +92,7 @@ return array( | |||||||
|     'rsrc/css/application/policy/policy.css' => '957ea14c', |     'rsrc/css/application/policy/policy.css' => '957ea14c', | ||||||
|     'rsrc/css/application/ponder/comments.css' => '6cdccea7', |     'rsrc/css/application/ponder/comments.css' => '6cdccea7', | ||||||
|     'rsrc/css/application/ponder/feed.css' => 'e62615b6', |     'rsrc/css/application/ponder/feed.css' => 'e62615b6', | ||||||
|     'rsrc/css/application/ponder/post.css' => 'ebab8a70', |     'rsrc/css/application/ponder/post.css' => '9d415218', | ||||||
|     'rsrc/css/application/ponder/vote.css' => '8ed6ed8b', |     'rsrc/css/application/ponder/vote.css' => '8ed6ed8b', | ||||||
|     'rsrc/css/application/profile/profile-view.css' => '1a20dcbf', |     'rsrc/css/application/profile/profile-view.css' => '1a20dcbf', | ||||||
|     'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1', |     'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1', | ||||||
| @@ -513,9 +513,9 @@ return array( | |||||||
|     'changeset-view-manager' => '58562350', |     'changeset-view-manager' => '58562350', | ||||||
|     'config-options-css' => '7fedf08b', |     'config-options-css' => '7fedf08b', | ||||||
|     'config-welcome-css' => '6abd79be', |     'config-welcome-css' => '6abd79be', | ||||||
|     'conpherence-durable-column-view' => 'a27580c5', |     'conpherence-durable-column-view' => 'e5a70c22', | ||||||
|     'conpherence-menu-css' => '9b37a261', |     'conpherence-menu-css' => '9b37a261', | ||||||
|     'conpherence-message-pane-css' => 'e78e9d3c', |     'conpherence-message-pane-css' => '0c4dfb6f', | ||||||
|     'conpherence-notification-css' => '04a6e10a', |     'conpherence-notification-css' => '04a6e10a', | ||||||
|     'conpherence-thread-manager' => 'bb928342', |     'conpherence-thread-manager' => 'bb928342', | ||||||
|     'conpherence-update-css' => '1099a660', |     'conpherence-update-css' => '1099a660', | ||||||
| @@ -525,7 +525,7 @@ return array( | |||||||
|     'differential-inline-comment-editor' => 'b3412377', |     'differential-inline-comment-editor' => 'b3412377', | ||||||
|     'differential-results-table-css' => '181aa9d9', |     'differential-results-table-css' => '181aa9d9', | ||||||
|     'differential-revision-add-comment-css' => 'c478bcaa', |     'differential-revision-add-comment-css' => 'c478bcaa', | ||||||
|     'differential-revision-comment-css' => '48186045', |     'differential-revision-comment-css' => '64603753', | ||||||
|     'differential-revision-history-css' => '0e8eb855', |     'differential-revision-history-css' => '0e8eb855', | ||||||
|     'differential-revision-list-css' => 'f3c47d33', |     'differential-revision-list-css' => 'f3c47d33', | ||||||
|     'differential-table-of-contents-css' => '63f3ef4a', |     'differential-table-of-contents-css' => '63f3ef4a', | ||||||
| @@ -747,7 +747,7 @@ return array( | |||||||
|     'phabricator-textareautils' => '5c93c52c', |     'phabricator-textareautils' => '5c93c52c', | ||||||
|     'phabricator-title' => '5c1c758c', |     'phabricator-title' => '5c1c758c', | ||||||
|     'phabricator-tooltip' => '1d298e3a', |     'phabricator-tooltip' => '1d298e3a', | ||||||
|     'phabricator-transaction-view-css' => '5d0cae25', |     'phabricator-transaction-view-css' => '042fc4bb', | ||||||
|     'phabricator-ui-example-css' => '528b19de', |     'phabricator-ui-example-css' => '528b19de', | ||||||
|     'phabricator-uiexample-javelin-view' => 'd4a14807', |     'phabricator-uiexample-javelin-view' => 'd4a14807', | ||||||
|     'phabricator-uiexample-reactor-button' => 'd19198c8', |     'phabricator-uiexample-reactor-button' => 'd19198c8', | ||||||
| @@ -810,7 +810,7 @@ return array( | |||||||
|     'policy-transaction-detail-css' => '82100a43', |     'policy-transaction-detail-css' => '82100a43', | ||||||
|     'ponder-comment-table-css' => '6cdccea7', |     'ponder-comment-table-css' => '6cdccea7', | ||||||
|     'ponder-feed-view-css' => 'e62615b6', |     'ponder-feed-view-css' => 'e62615b6', | ||||||
|     'ponder-post-css' => 'ebab8a70', |     'ponder-post-css' => '9d415218', | ||||||
|     'ponder-vote-css' => '8ed6ed8b', |     'ponder-vote-css' => '8ed6ed8b', | ||||||
|     'project-icon-css' => 'c2ecb7f1', |     'project-icon-css' => 'c2ecb7f1', | ||||||
|     'raphael-core' => '51ee6b43', |     'raphael-core' => '51ee6b43', | ||||||
|   | |||||||
| @@ -99,9 +99,9 @@ final class ConpherenceTransactionView extends AphrontView { | |||||||
|       case PhabricatorTransactions::TYPE_JOIN_POLICY: |       case PhabricatorTransactions::TYPE_JOIN_POLICY: | ||||||
|         $content = $transaction->getTitle(); |         $content = $transaction->getTitle(); | ||||||
|         $transaction_view->addClass('conpherence-edited'); |         $transaction_view->addClass('conpherence-edited'); | ||||||
|         $transaction_view->addClass('grouped'); |  | ||||||
|         break; |         break; | ||||||
|       case PhabricatorTransactions::TYPE_COMMENT: |       case PhabricatorTransactions::TYPE_COMMENT: | ||||||
|  |         $transaction_view->addClass('conpherence-comment'); | ||||||
|         $comment = $transaction->getComment(); |         $comment = $transaction->getComment(); | ||||||
|         $content = $this->markupEngine->getOutput( |         $content = $this->markupEngine->getOutput( | ||||||
|           $comment, |           $comment, | ||||||
|   | |||||||
| @@ -720,8 +720,6 @@ final class DiffusionCommitController extends DiffusionController { | |||||||
|     $header->setHeader( |     $header->setHeader( | ||||||
|       $is_serious ? pht('Audit Commit') : pht('Creative Accounting')); |       $is_serious ? pht('Audit Commit') : pht('Creative Accounting')); | ||||||
|  |  | ||||||
|     require_celerity_resource('phabricator-transaction-view-css'); |  | ||||||
|  |  | ||||||
|     $mailable_source = new PhabricatorMetaMTAMailableDatasource(); |     $mailable_source = new PhabricatorMetaMTAMailableDatasource(); | ||||||
|     $auditor_source = new DiffusionAuditorDatasource(); |     $auditor_source = new DiffusionAuditorDatasource(); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -75,12 +75,12 @@ final class PhabricatorTransactionView extends AphrontView { | |||||||
|     return phutil_tag( |     return phutil_tag( | ||||||
|       'div', |       'div', | ||||||
|       array( |       array( | ||||||
|         'class' => 'phabricator-transaction-view', |         'class' => 'phabricator-transaction-view '.$classes, | ||||||
|         'id'    => $transaction_id, |         'id'    => $transaction_id, | ||||||
|         'style' => $style, |         'style' => $style, | ||||||
|       ), |       ), | ||||||
|       phutil_tag_div( |       phutil_tag_div( | ||||||
|         'phabricator-transaction-detail '.$classes, |         'phabricator-transaction-detail grouped', | ||||||
|         array($header, $content))); |         array($header, $content))); | ||||||
|  |  | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -13,13 +13,6 @@ | |||||||
|   margin: 10px 0; |   margin: 10px 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| .phabricator-transaction-detail { |  | ||||||
|   border-color: #dddddd; |  | ||||||
|   border-width: 1px 4px; |  | ||||||
|   border-style: solid; |  | ||||||
|   margin-left: 60px; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .device-phone .phabricator-transaction-detail { | .device-phone .phabricator-transaction-detail { | ||||||
|   margin: 0; |   margin: 0; | ||||||
|   min-height: 50px; |   min-height: 50px; | ||||||
| @@ -33,6 +26,7 @@ | |||||||
|  |  | ||||||
| .phabricator-transaction-header a { | .phabricator-transaction-header a { | ||||||
|   font-weight: bold; |   font-weight: bold; | ||||||
|  |   color: {$darkbluetext}; | ||||||
| } | } | ||||||
|  |  | ||||||
| .phabricator-transaction-info { | .phabricator-transaction-info { | ||||||
|   | |||||||
| @@ -128,10 +128,12 @@ | |||||||
|   padding: 8px 12px 0; |   padding: 8px 12px 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-durable-column-transactions .conpherence-edited { | .conpherence-durable-column-transactions | ||||||
|   color: {$lightgreytext}; |   .phabricator-transaction-view.conpherence-edited { | ||||||
|   font-size: 12px; |     color: {$lightgreytext}; | ||||||
|   margin: 0; |     font-size: 12px; | ||||||
|  |     margin: 0; | ||||||
|  |     padding: 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-durable-column-transactions .conpherence-edited | .conpherence-durable-column-transactions .conpherence-edited | ||||||
| @@ -173,7 +175,8 @@ | |||||||
|   top: -11px; |   top: -11px; | ||||||
|   left: 0; |   left: 0; | ||||||
|   background-color: #fff; |   background-color: #fff; | ||||||
|   color: {$lightbluetext}; |   color: {$darkbluetext}; | ||||||
|  |   font-weight: bold; | ||||||
|   font-size: 12px; |   font-size: 12px; | ||||||
|   padding: 0 6px 0 0; |   padding: 0 6px 0 0; | ||||||
| } | } | ||||||
| @@ -187,7 +190,6 @@ | |||||||
|  |  | ||||||
| .conpherence-durable-column-transactions .phabricator-transaction-detail | .conpherence-durable-column-transactions .phabricator-transaction-detail | ||||||
| .phabricator-transaction-header .phui-link-person { | .phabricator-transaction-header .phui-link-person { | ||||||
|   color: {$darkbluetext}; |  | ||||||
|   margin: 0 8px 0 0; |   margin: 0 8px 0 0; | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -149,17 +149,20 @@ | |||||||
|   margin: 12px 12px 4px; |   margin: 12px 12px 4px; | ||||||
|   min-height: auto; |   min-height: auto; | ||||||
| } | } | ||||||
|  |  | ||||||
| .device-phone .conpherence-message-pane .date-marker { | .device-phone .conpherence-message-pane .date-marker { | ||||||
|   margin: 5px 0; |   margin: 5px 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-message-pane .date-marker .date { | .conpherence-message-pane .date-marker .date { | ||||||
|   position: relative; |   position: relative; | ||||||
|   top: -11px; |   top: -11px; | ||||||
|   left: 40px; |   left: 40px; | ||||||
|   background-color: #FFF; |   background-color: #FFF; | ||||||
|   color: {$bluetext}; |   color: {$darkbluetext}; | ||||||
|   font-size: 12px; |   font-size: 13px; | ||||||
|   padding: 0px 5px; |   padding: 0px 5px; | ||||||
|  |   font-weight: bold; | ||||||
| } | } | ||||||
|  |  | ||||||
| .device-phone .conpherence-message-pane .phabricator-transaction-detail { | .device-phone .conpherence-message-pane .phabricator-transaction-detail { | ||||||
| @@ -174,12 +177,19 @@ | |||||||
|   float: left; |   float: left; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-message-pane .conpherence-edited .phabricator-transaction-header { | .conpherence-message-pane .conpherence-edited { | ||||||
|   float: right; |   padding: 0; | ||||||
|  |   margin-top: 0; | ||||||
|  |   margin-bottom: 0; | ||||||
|  |   min-height: inherit; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-message-pane .conpherence-edited { | .conpherence-message-pane .conpherence-edited + .conpherence-comment { | ||||||
|   padding-top: 12px; |   margin-top: 20px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .conpherence-message-pane .conpherence-edited .phabricator-transaction-header { | ||||||
|  |   float: right; | ||||||
| } | } | ||||||
|  |  | ||||||
| .device-phone .conpherence-message-pane .conpherence-edited { | .device-phone .conpherence-message-pane .conpherence-edited { | ||||||
| @@ -211,10 +221,6 @@ | |||||||
|   padding: 0; |   padding: 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| .conpherence-message-pane .phabricator-transaction-header a { |  | ||||||
|   color: {$darkbluetext}; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .conpherence-message-pane .phabricator-transaction-content { | .conpherence-message-pane .phabricator-transaction-content { | ||||||
|   padding: 2px 0 8px 0; |   padding: 2px 0 8px 0; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,10 +6,6 @@ | |||||||
|   margin: 0 16px; |   margin: 0 16px; | ||||||
| } | } | ||||||
|  |  | ||||||
| .differential-comment-list .phabricator-transaction-content { |  | ||||||
|   background: #ffffff; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /*  Spooky haunted panel which floats on the bottom of the screen. | /*  Spooky haunted panel which floats on the bottom of the screen. | ||||||
|     Haunt modes are: |     Haunt modes are: | ||||||
|  |  | ||||||
| @@ -64,47 +60,3 @@ | |||||||
| .differential-inline-comment-content { | .differential-inline-comment-content { | ||||||
|   overflow: auto; |   overflow: auto; | ||||||
| } | } | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-testplan { |  | ||||||
|   border-color:     #660099; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-abandon { |  | ||||||
|   border-color:     #222222; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-accept { |  | ||||||
|   border-color:     #009966; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-reject { |  | ||||||
|   border-color:     #aa0000; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-rethink { |  | ||||||
|   border-color:     #aa0000; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-commit { |  | ||||||
|   border-color:     #006699; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-reclaim { |  | ||||||
|   border-color:     #0099aa; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-update { |  | ||||||
|   border-color:     #6699cc; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-add_reviewers { |  | ||||||
|   border-color:     #aa99cc; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-request_review { |  | ||||||
|   border-color:     #cc9966; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .differential-comment-action-claim { |  | ||||||
|   border-color:     #ffdd33; |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -21,23 +21,5 @@ | |||||||
| } | } | ||||||
|  |  | ||||||
| .ponder-question { | .ponder-question { | ||||||
|    background : white; |    background: white; | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .ponder-question { |  | ||||||
|     background : white; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-detail .ponder-question { |  | ||||||
|     border : none; |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| .phabricator-transaction-view .ponder-answer { |  | ||||||
|     background : white; |  | ||||||
|     margin-bottom : 0; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .phabricator-transaction-content { |  | ||||||
|     background : white; |  | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Chad Little
					Chad Little