diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '5b6531df', + 'core.pkg.css' => '0784ef1d', 'core.pkg.js' => 'cbdbd552', 'darkconsole.pkg.js' => 'df001cab', 'differential.pkg.css' => '8af45893', @@ -68,7 +68,7 @@ 'rsrc/css/application/flag/flag.css' => '5337623f', 'rsrc/css/application/harbormaster/harbormaster.css' => '49d64eb4', 'rsrc/css/application/herald/herald-test.css' => '778b008e', - 'rsrc/css/application/herald/herald.css' => 'c544dd1c', + 'rsrc/css/application/herald/herald.css' => '826075fa', 'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc', 'rsrc/css/application/maniphest/report.css' => '6fc16517', 'rsrc/css/application/maniphest/task-edit.css' => '8e23031b', @@ -85,7 +85,7 @@ 'rsrc/css/application/phortune/phortune.css' => '9149f103', 'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad', 'rsrc/css/application/phriction/phriction-document-css.css' => '7d7f0071', - 'rsrc/css/application/policy/policy-edit.css' => '05cca26a', + 'rsrc/css/application/policy/policy-edit.css' => '815c66f7', 'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43', 'rsrc/css/application/policy/policy.css' => '957ea14c', 'rsrc/css/application/ponder/comments.css' => '6cdccea7', @@ -126,7 +126,7 @@ 'rsrc/css/phui/phui-document.css' => 'a5615198', 'rsrc/css/phui/phui-feed-story.css' => 'dd3c5ff5', 'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce', - 'rsrc/css/phui/phui-form-view.css' => 'a3efd18c', + 'rsrc/css/phui/phui-form-view.css' => 'c875f46c', 'rsrc/css/phui/phui-form.css' => 'b78ec020', 'rsrc/css/phui/phui-header-view.css' => '39594ac0', 'rsrc/css/phui/phui-icon.css' => 'b4963a4f', @@ -443,7 +443,7 @@ 'rsrc/js/core/Hovercard.js' => '7e8468ae', 'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2', 'rsrc/js/core/KeyboardShortcutManager.js' => 'ad7a69ca', - 'rsrc/js/core/MultirowRowManager.js' => '41e47dea', + 'rsrc/js/core/MultirowRowManager.js' => 'b5d57730', 'rsrc/js/core/Notification.js' => '0c6946e7', 'rsrc/js/core/Prefab.js' => 'bbae734c', 'rsrc/js/core/ShapedRequest.js' => '7cbe244b', @@ -536,7 +536,7 @@ 'font-source-sans-pro' => '91d53463', 'global-drag-and-drop-css' => '697324ad', 'harbormaster-css' => '49d64eb4', - 'herald-css' => 'c544dd1c', + 'herald-css' => '826075fa', 'herald-rule-editor' => '335fd41f', 'herald-test-css' => '778b008e', 'inline-comment-summary-css' => '8cfd34e8', @@ -697,7 +697,7 @@ 'maniphest-report-css' => '6fc16517', 'maniphest-task-edit-css' => '8e23031b', 'maniphest-task-summary-css' => '13ed8360', - 'multirow-row-manager' => '41e47dea', + 'multirow-row-manager' => 'b5d57730', 'owners-path-editor' => 'aa1733d0', 'owners-path-editor-css' => '2f00933b', 'paste-css' => 'aa1767d1', @@ -776,7 +776,7 @@ 'phui-font-icon-base-css' => '3dad2ae3', 'phui-fontkit-css' => '9c3d2dce', 'phui-form-css' => 'b78ec020', - 'phui-form-view-css' => 'a3efd18c', + 'phui-form-view-css' => 'c875f46c', 'phui-header-view-css' => '39594ac0', 'phui-icon-view-css' => 'b4963a4f', 'phui-image-mask-css' => '5a8b09c8', @@ -798,7 +798,7 @@ 'phuix-action-view' => '6e8cefa4', 'phuix-dropdown-menu' => 'bd4c8dca', 'policy-css' => '957ea14c', - 'policy-edit-css' => '05cca26a', + 'policy-edit-css' => '815c66f7', 'policy-transaction-detail-css' => '82100a43', 'ponder-comment-table-css' => '6cdccea7', 'ponder-feed-view-css' => 'e62615b6', @@ -1096,12 +1096,6 @@ 'phuix-action-list-view', 'phuix-action-view', ), - '41e47dea' => array( - 'javelin-install', - 'javelin-stratcom', - 'javelin-dom', - 'javelin-util', - ), '44168bad' => array( 'javelin-behavior', 'javelin-dom', @@ -1605,6 +1599,12 @@ 'javelin-install', 'javelin-dom', ), + 'b5d57730' => array( + 'javelin-install', + 'javelin-stratcom', + 'javelin-dom', + 'javelin-util', + ), 'b6d401d6' => array( 'javelin-dom', 'javelin-dynval', diff --git a/webroot/rsrc/css/application/herald/herald.css b/webroot/rsrc/css/application/herald/herald.css --- a/webroot/rsrc/css/application/herald/herald.css +++ b/webroot/rsrc/css/application/herald/herald.css @@ -17,10 +17,15 @@ .herald-action-table td, .herald-condition-table td { - padding: 2px 4px; + padding: 2px 8px 2px 0; vertical-align: middle; } +.herald-action-table td.remove-column, +.herald-condition-table td.remove-column { + padding: 2px 0 2px 4px; +} + .herald-condition-table td.value { width: 100%; } diff --git a/webroot/rsrc/css/application/policy/policy-edit.css b/webroot/rsrc/css/application/policy/policy-edit.css --- a/webroot/rsrc/css/application/policy/policy-edit.css +++ b/webroot/rsrc/css/application/policy/policy-edit.css @@ -7,11 +7,15 @@ } .policy-rules-table td { - padding: 4px; + padding: 4px 8px 4px 0; width: 32px; vertical-align: middle; } +.policy-rules-table td.remove-column { + padding-right: 0; +} + .policy-rules-table td.action-cell { width: 120px; } diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css --- a/webroot/rsrc/css/phui/phui-form-view.css +++ b/webroot/rsrc/css/phui/phui-form-view.css @@ -252,16 +252,20 @@ } .phui-form-inset { - margin: 0 0 8px; + margin: 4px 0 8px; padding: 8px; - background: #fff; - border: 1px solid #d4dae0; + background: #f7f9fd; + border: 1px solid {$lightblueborder}; + border-bottom: 1px solid {$blueborder}; + border-radius: 3px; } .phui-form-inset h1 { - color: {$greytext}; - font-weight: normal; + color: {$bluetext}; padding-bottom: 8px; + margin-bottom: 8px; + font-size: 14px; + border-bottom: 1px solid {$thinblueborder}; } .aphront-form-drag-and-drop-file-list { diff --git a/webroot/rsrc/js/core/MultirowRowManager.js b/webroot/rsrc/js/core/MultirowRowManager.js --- a/webroot/rsrc/js/core/MultirowRowManager.js +++ b/webroot/rsrc/js/core/MultirowRowManager.js @@ -57,13 +57,13 @@ var removeButton = JX.$N( 'td', - {}, + { className: 'remove-column' }, JX.$N( 'a', - { className: 'button', + { className: 'button simple', sigil: JX.MultirowRowManager._removeSigil }, - '-')); + 'Remove')); JX.DOM.appendContent(row, removeButton); return row;