diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 1aa6fe763e..50a3322c05 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '38e621cb', + 'core.pkg.css' => '8d1c0f87', 'core.pkg.js' => '27bb3264', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '8af45893', @@ -105,7 +105,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => 'ca42b69f', - 'rsrc/css/core/remarkup.css' => '7604f12e', + 'rsrc/css/core/remarkup.css' => '0ee3d256', 'rsrc/css/core/syntax.css' => '56c1ba38', 'rsrc/css/core/z-index.css' => '44e1d311', 'rsrc/css/diviner/diviner-shared.css' => '38813222', @@ -729,7 +729,7 @@ return array( 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '72da38cc', 'phabricator-profile-css' => 'fddedfa1', - 'phabricator-remarkup-css' => '7604f12e', + 'phabricator-remarkup-css' => '0ee3d256', 'phabricator-search-results-css' => 'f240504c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '7e8c6341', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 6f9b9fc62b..7008d95bd3 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -5214,6 +5214,7 @@ phutil_register_library_map(array( 'PhabricatorOAuthServerClient' => array( 'PhabricatorOAuthServerDAO', 'PhabricatorPolicyInterface', + 'PhabricatorDestructibleInterface', ), 'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'PhabricatorPHIDType', 'PhabricatorOAuthServerClientPHIDType' => 'PhabricatorPHIDType', @@ -5350,6 +5351,7 @@ phutil_register_library_map(array( 'PhabricatorPolicy' => array( 'PhabricatorPolicyDAO', 'PhabricatorPolicyInterface', + 'PhabricatorDestructibleInterface', ), 'PhabricatorPolicyApplication' => 'PhabricatorApplication', 'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery', diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index f5314d2231..552d13c4d5 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -10,10 +10,6 @@ margin: 0 0 12px; } -.phabricator-remarkup p:last-child { - margin-bottom: 0; -} - .phabricator-remarkup .remarkup-code-block { margin: 12px; white-space: pre; @@ -96,24 +92,6 @@ list-style-type: none; } -.phabricator-remarkup h1.remarkup-header:first-child, -.phabricator-remarkup h2.remarkup-header:first-child, -.phabricator-remarkup h3.remarkup-header:first-child, -.phabricator-remarkup h4.remarkup-header:first-child, -.phabricator-remarkup h5.remarkup-header:first-child, -.phabricator-remarkup h6.remarkup-header:first-child { - margin-top: 0; -} - -.phabricator-remarkup h1.remarkup-header:last-child, -.phabricator-remarkup h2.remarkup-header:last-child, -.phabricator-remarkup h3.remarkup-header:last-child, -.phabricator-remarkup h4.remarkup-header:last-child, -.phabricator-remarkup h5.remarkup-header:last-child, -.phabricator-remarkup h6.remarkup-header:last-child { - margin-bottom: 0; -} - .phabricator-remarkup h1.remarkup-header { font-size: 1.625em; line-height: 1.625em; @@ -341,6 +319,36 @@ padding: 3px 6px; } +.phabricator-remarkup p:first-child, +.phabricator-remarkup ul.remarkup-list:first-child, +.phabricator-remarkup ol.remarkup-list:first-child, +.phabricator-remarkup .remarkup-code-block:first-child, +.phabricator-remarkup h1.remarkup-header:first-child, +.phabricator-remarkup h2.remarkup-header:first-child, +.phabricator-remarkup h3.remarkup-header:first-child, +.phabricator-remarkup h4.remarkup-header:first-child, +.phabricator-remarkup h5.remarkup-header:first-child, +.phabricator-remarkup h6.remarkup-header:first-child, +.phabricator-remarkup blockquote:first-child, +.phabricator-remarkup table.remarkup-table:first-child { + margin-top: 0; +} + +.phabricator-remarkup p:last-child, +.phabricator-remarkup ul.remarkup-list:last-child, +.phabricator-remarkup ol.remarkup-list:last-child, +.phabricator-remarkup .remarkup-code-block:last-child, +.phabricator-remarkup h1.remarkup-header:last-child, +.phabricator-remarkup h2.remarkup-header:last-child, +.phabricator-remarkup h3.remarkup-header:last-child, +.phabricator-remarkup h4.remarkup-header:last-child, +.phabricator-remarkup h5.remarkup-header:last-child, +.phabricator-remarkup h6.remarkup-header:last-child, +.phabricator-remarkup blockquote:last-child, +.phabricator-remarkup table.remarkup-table:last-child { + margin-bottom: 0; +} + .remarkup-assist-textarea { border-left-color: {$blueborder}; border-right-color: {$blueborder};