diff --git a/resources/celerity/map.php b/resources/celerity/map.php index c98b1a2d1f..6ae21b8183 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '96a7378c', + 'core.pkg.css' => '9cbee819', 'core.pkg.js' => '41f5edc5', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'fe951924', @@ -108,7 +108,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => '47adcf87', - 'rsrc/css/core/remarkup.css' => '13368efd', + 'rsrc/css/core/remarkup.css' => '990dbed4', 'rsrc/css/core/syntax.css' => '9fd11da8', 'rsrc/css/core/z-index.css' => '63689f49', 'rsrc/css/diviner/diviner-shared.css' => '7545fd9e', @@ -130,8 +130,8 @@ return array( 'rsrc/css/phui/phui-button.css' => 'f4d9c140', 'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2', 'rsrc/css/phui/phui-document.css' => 'bc45d313', - 'rsrc/css/phui/phui-feed-story.css' => '25913b7b', - 'rsrc/css/phui/phui-fontkit.css' => '28739edc', + 'rsrc/css/phui/phui-feed-story.css' => '1399290a', + 'rsrc/css/phui/phui-fontkit.css' => '1a18fe95', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', 'rsrc/css/phui/phui-form.css' => '17ce37a9', 'rsrc/css/phui/phui-header-view.css' => 'b9a83326', @@ -150,7 +150,7 @@ return array( 'rsrc/css/phui/phui-status.css' => '888cedb8', 'rsrc/css/phui/phui-tag-view.css' => '402691cc', 'rsrc/css/phui/phui-text.css' => 'cf019f54', - 'rsrc/css/phui/phui-timeline-view.css' => '07a1bd0f', + 'rsrc/css/phui/phui-timeline-view.css' => 'b9d72b7f', 'rsrc/css/phui/phui-workboard-view.css' => '0cac51a4', 'rsrc/css/phui/phui-workpanel-view.css' => '4bdc2562', 'rsrc/css/sprite-login.css' => 'a3526809', @@ -730,7 +730,7 @@ return array( 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '6920d200', - 'phabricator-remarkup-css' => '13368efd', + 'phabricator-remarkup-css' => '990dbed4', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '4f2cd343', @@ -770,9 +770,9 @@ return array( 'phui-calendar-month-css' => '476be7e0', 'phui-crumbs-view-css' => 'ce840ec2', 'phui-document-view-css' => 'bc45d313', - 'phui-feed-story-css' => '25913b7b', + 'phui-feed-story-css' => '1399290a', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => '28739edc', + 'phui-fontkit-css' => '1a18fe95', 'phui-form-css' => '17ce37a9', 'phui-form-view-css' => 'a0e8f168', 'phui-header-view-css' => 'b9a83326', @@ -793,7 +793,7 @@ return array( 'phui-tag-view-css' => '402691cc', 'phui-text-css' => 'cf019f54', 'phui-theme-css' => '1ccdcc84', - 'phui-timeline-view-css' => '07a1bd0f', + 'phui-timeline-view-css' => 'b9d72b7f', 'phui-workboard-view-css' => '0cac51a4', 'phui-workpanel-view-css' => '4bdc2562', 'phuix-action-list-view' => 'b5c256b8', diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php index 52fa110c32..c96f22e338 100644 --- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php +++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php @@ -50,4 +50,23 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject { return $color; } + public static function getStatusIcon($code) { + switch ($code) { + case self::CONCERN_RAISED: + $icon = 'fa-exclamation-triangle'; + break; + case self::NEEDS_AUDIT: + case self::PARTIALLY_AUDITED: + $icon = 'fa-exclamation-triangle'; + break; + case self::FULLY_AUDITED: + $icon = 'fa-check'; + break; + default: + $icon = null; + break; + } + return $icon; + } + } diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php index 20b7ffcf9d..593172006c 100644 --- a/src/applications/audit/view/PhabricatorAuditListView.php +++ b/src/applications/audit/view/PhabricatorAuditListView.php @@ -141,10 +141,13 @@ final class PhabricatorAuditListView extends AphrontView { PhabricatorAuditStatusConstants::getStatusName($status_code); $status_color = PhabricatorAuditStatusConstants::getStatusColor($status_code); + $status_icon = + PhabricatorAuditStatusConstants::getStatusIcon($status_code); } else { $reasons = null; $status_text = null; $status_color = null; + $status_icon = null; } $author_phid = $commit->getAuthorPHID(); if ($author_phid) { @@ -167,7 +170,7 @@ final class PhabricatorAuditListView extends AphrontView { if ($status_color) { $item->setStatusIcon( - 'fa-exclamation-triangle '.$status_color, $status_text); + $status_icon.' '.$status_color, $status_text); } $list->addItem($item); diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index efef1b3573..fba76d84aa 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -43,8 +43,7 @@ display: block; color: #000000; overflow: auto; - padding: 8px; - font-family: "Monaco", monospace; + padding: 12px 8px; } .phabricator-remarkup pre.remarkup-counterexample { @@ -159,12 +158,12 @@ } .phabricator-remarkup blockquote { - border-left: 3px solid {$lightbluetext}; + border-left: 3px solid {$sh-blueborder}; color: {$darkbluetext}; font-style: italic; margin: 4px 0 12px 0; padding: 8px 12px; - background-color: #F2F4F9; + background-color: {$lightbluebackground}; } .phabricator-remarkup blockquote blockquote { diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css index df932b21ac..064b712d4b 100644 --- a/webroot/rsrc/css/phui/phui-feed-story.css +++ b/webroot/rsrc/css/phui/phui-feed-story.css @@ -17,7 +17,7 @@ } .phui-feed-story-head { - padding: 12px 8px; + padding: 12px 4px; overflow: hidden; color: {$greytext}; line-height: 16px; @@ -29,7 +29,7 @@ } .phui-feed-story-body { - margin: 4px 8px 8px; + margin: 4px 4px 8px; color: {$darkgreytext}; word-break: break-word; max-height: 300px; @@ -38,7 +38,7 @@ .phui-feed-story-foot { font-size: 12px; - padding: 8px 8px 12px 8px; + padding: 8px 4px 12px; } .phui-feed-story-foot, diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css index 8f10f00dda..30f7e019be 100644 --- a/webroot/rsrc/css/phui/phui-fontkit.css +++ b/webroot/rsrc/css/phui/phui-fontkit.css @@ -8,7 +8,6 @@ */ -.phui-document-view .phui-header-tall .phui-header-header, .diviner-document-section .phui-header-header { font-family: 'Slabo', {$fontfamily}; color: {$darkbluetext}; diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css index df36a4ac52..d18c9e095a 100644 --- a/webroot/rsrc/css/phui/phui-timeline-view.css +++ b/webroot/rsrc/css/phui/phui-timeline-view.css @@ -25,6 +25,7 @@ .phui-timeline-major-event .phui-timeline-group { border-left: 1px solid {$lightblueborder}; border-right: 1px solid {$lightblueborder}; + border-radius: 3px; } .device-desktop .phui-timeline-event-view { @@ -62,10 +63,11 @@ .phui-timeline-major-event .phui-timeline-content { border-top: 1px solid {$lightblueborder}; border-bottom: 1px solid {$lightblueborder}; + border-radius: 3px; } .phui-timeline-title { - line-height: 18px; + line-height: 22px; min-height: 19px; position: relative; color: {$bluetext}; @@ -85,18 +87,17 @@ } .device-desktop .phui-timeline-major-event .phui-timeline-wedge { - top: 24px; + top: 26px; } .device-desktop .phui-timeline-minor-event .phui-timeline-wedge { - top: 12px; + top: 13px; left: -18px; width: 20px; } .phui-timeline-image { background-repeat: no-repeat; - background-size: 100%; position: absolute; border-radius: 3px; } @@ -116,8 +117,13 @@ } .phui-timeline-major-event .phui-timeline-title { - background: {$lightgreybackground}; - min-height: 18px; + background: {$lightbluebackground}; + min-height: 22px; + border-top-right-radius: 3px; +} + +.phui-timeline-title + .phui-timeline-title { + border-radius: 0; } .phui-timeline-title { @@ -164,6 +170,8 @@ padding: 16px 12px; line-height: 18px; background: #fff; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; } .phui-timeline-core-content { @@ -203,8 +211,8 @@ .phui-timeline-icon-fill { position: absolute; - width: 30px; - height: 30px; + width: 32px; + height: 32px; background-color: {$lightblueborder}; top: 0; left: 0; @@ -212,21 +220,21 @@ } .phui-icon-view.phui-timeline-icon:before { - font-size: 14px; + font-size: 15px; } .phui-timeline-minor-event .phui-timeline-icon-fill { - height: 26px; - width: 26px; + height: 28px; + width: 28px; border-radius: 3px; } .phui-timeline-icon-fill .phui-timeline-icon { - margin-top: 7px; + margin-top: 8px; } .phui-timeline-minor-event .phui-timeline-icon-fill .phui-timeline-icon { - margin-top: 6px; + margin-top: 7px; } .phui-timeline-extra, @@ -238,7 +246,6 @@ .phui-timeline-title .phui-timeline-extra a { font-weight: normal; - color: {$bluetext}; } .device-desktop .phui-timeline-extra { @@ -347,7 +354,7 @@ .phui-timeline-menu { position: absolute; right: 3px; - top: 4px; + top: 6px; width: 28px; height: 22px; text-align: center;