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' => '7f0d6232', + 'core.pkg.css' => 'cca0aa95', 'core.pkg.js' => 'a590b451', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '1b36e899', @@ -108,13 +108,13 @@ 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => 'a76cefc9', - 'rsrc/css/core/remarkup.css' => 'a4f23e80', + 'rsrc/css/core/remarkup.css' => 'f33ce157', 'rsrc/css/core/syntax.css' => '9fd11da8', 'rsrc/css/core/z-index.css' => '63689f49', - 'rsrc/css/diviner/diviner-shared.css' => '7545fd9e', + 'rsrc/css/diviner/diviner-shared.css' => '5a337049', 'rsrc/css/font/font-awesome.css' => 'e2e712fe', 'rsrc/css/font/font-lato.css' => '564bfc7a', - 'rsrc/css/font/font-slabo.css' => '1f520937', + 'rsrc/css/font/font-roboto-slab.css' => 'cda88637', 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '0a08eb6c', @@ -129,16 +129,16 @@ 'rsrc/css/phui/phui-box.css' => 'a5bb366d', '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-document.css' => 'dd07b216', 'rsrc/css/phui/phui-feed-story.css' => 'c70d2dd9', - 'rsrc/css/phui/phui-fontkit.css' => '6790f776', + 'rsrc/css/phui/phui-fontkit.css' => '0d04121b', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', 'rsrc/css/phui/phui-form.css' => '17ce37a9', 'rsrc/css/phui/phui-header-view.css' => '541c6cc7', 'rsrc/css/phui/phui-icon.css' => '88ba9081', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', - 'rsrc/css/phui/phui-info-view.css' => '33e54618', + 'rsrc/css/phui/phui-info-view.css' => '5b16bac6', 'rsrc/css/phui/phui-list.css' => '02ab3534', 'rsrc/css/phui/phui-object-box.css' => '3db9f358', 'rsrc/css/phui/phui-object-item-list-view.css' => '762ae15a', @@ -170,8 +170,8 @@ 'rsrc/externals/font/lato/Lato-italic.woff2' => '2cc75b43', 'rsrc/externals/font/lato/Lato-regular.woff' => 'c139f3a4', 'rsrc/externals/font/lato/Lato-regular.woff2' => 'e3488ae9', - 'rsrc/externals/font/slabo/Slabo-Regular.woff' => 'ac58aed3', - 'rsrc/externals/font/slabo/Slabo-Regular.woff2' => '02b81b15', + 'rsrc/externals/font/robotoslab/RobotoSlab.woff' => '706dd595', + 'rsrc/externals/font/robotoslab/RobotoSlab.woff2' => '94a26562', 'rsrc/externals/javelin/core/Event.js' => '85ea0626', 'rsrc/externals/javelin/core/Stratcom.js' => '6c53634d', 'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4', @@ -520,10 +520,10 @@ 'diffusion-icons-css' => '4ba18923', 'diffusion-readme-css' => '2106ea08', 'diffusion-source-css' => '66fdf661', - 'diviner-shared-css' => '7545fd9e', + 'diviner-shared-css' => '5a337049', 'font-fontawesome' => 'e2e712fe', 'font-lato' => '564bfc7a', - 'font-slabo' => '1f520937', + 'font-roboto-slab' => 'cda88637', 'global-drag-and-drop-css' => '697324ad', 'harbormaster-css' => '49d64eb4', 'herald-css' => '826075fa', @@ -732,7 +732,7 @@ 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '6920d200', - 'phabricator-remarkup-css' => 'a4f23e80', + 'phabricator-remarkup-css' => 'f33ce157', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '4f2cd343', @@ -771,17 +771,17 @@ 'phui-calendar-list-css' => 'c1c7f338', 'phui-calendar-month-css' => '476be7e0', 'phui-crumbs-view-css' => 'ce840ec2', - 'phui-document-view-css' => 'bc45d313', + 'phui-document-view-css' => 'dd07b216', 'phui-feed-story-css' => 'c70d2dd9', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => '6790f776', + 'phui-fontkit-css' => '0d04121b', 'phui-form-css' => '17ce37a9', 'phui-form-view-css' => 'a0e8f168', 'phui-header-view-css' => '541c6cc7', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', - 'phui-info-view-css' => '33e54618', + 'phui-info-view-css' => '5b16bac6', 'phui-inline-comment-view-css' => 'fa5b8d1f', 'phui-list-view-css' => '02ab3534', 'phui-object-box-css' => '3db9f358', @@ -959,9 +959,6 @@ 'javelin-dom', 'javelin-reactor-dom', ), - '1f520937' => array( - 'phui-fontkit-css', - ), '2035b9cb' => array( 'javelin-behavior', 'javelin-dom', @@ -1781,6 +1778,9 @@ 'javelin-util', 'phabricator-notification-css', ), + 'cda88637' => array( + 'phui-fontkit-css', + ), 'cf86d16a' => array( 'javelin-behavior', 'javelin-dom', diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php --- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php +++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php @@ -352,17 +352,23 @@ $header = id(new PHUIHeaderView()) ->setHeader(pht('Welcome to Phabricator')); - $setup_header = id(new PHUIHeaderView()) - ->setHeader(pht('Setup and Configuration')) - ->setBleedHeader(true); + $setup_header = PhabricatorMarkupEngine::renderOneObject( + id(new PhabricatorMarkupOneOff()) + ->setContent(pht('=Setup and Configuration')), + 'default', + $viewer); - $explore_header = id(new PHUIHeaderView()) - ->setHeader(pht('Explore Phabricator')) - ->setBleedHeader(true); + $explore_header = PhabricatorMarkupEngine::renderOneObject( + id(new PhabricatorMarkupOneOff()) + ->setContent(pht('=Explore Phabricator')), + 'default', + $viewer); - $quick_header = id(new PHUIHeaderView()) - ->setHeader(pht('Quick Start Guides')) - ->setBleedHeader(true); + $quick_header = PhabricatorMarkupEngine::renderOneObject( + id(new PhabricatorMarkupOneOff()) + ->setContent(pht('=Quick Start Guides')), + 'default', + $viewer); return id(new PHUIDocumentView()) ->setHeader($header) diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php --- a/src/applications/diviner/controller/DivinerAtomController.php +++ b/src/applications/diviner/controller/DivinerAtomController.php @@ -75,11 +75,14 @@ $group_name = null; } + $prop_list = new PHUIPropertyGroupView(); + $prop_list->addPropertyList($properties); + $document = id(new PHUIDocumentView()) ->setBook($book->getTitle(), $group_name) ->setHeader($header) ->addClass('diviner-view') - ->appendChild($properties); + ->appendChild($prop_list); if ($atom) { $this->buildDefined($properties, $symbol); diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php --- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php @@ -250,7 +250,7 @@ ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); - $preamble = null; + $preamble_box = null; if (strlen($document->getPreamble())) { $preamble_text = PhabricatorMarkupEngine::renderOneObject( id(new PhabricatorMarkupOneOff())->setContent( @@ -259,8 +259,14 @@ $viewer); $preamble = id(new PHUIPropertyListView()) + ->setUser($viewer) + ->setObject($document) ->addSectionHeader(pht('Preamble')) ->addTextContent($preamble_text); + + $preamble_box = new PHUIPropertyGroupView(); + $preamble_box->addPropertyList($preamble); + } $content = id(new PHUIDocumentView()) @@ -269,7 +275,7 @@ ->appendChild( array( $signed_status, - $preamble, + $preamble_box, $document_markup, )); diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -44,7 +44,7 @@ $create_uri = '/phriction/edit/?slug='.$slug; $notice = new PHUIInfoView(); - $notice->setSeverity(PHUIInfoView::SEVERITY_NODATA); + $notice->setSeverity(PHUIInfoView::SEVERITY_WARNING); $notice->setTitle(pht('No content here!')); $notice->appendChild( pht( diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -174,7 +174,7 @@ require_celerity_resource('phabricator-standard-page-view'); require_celerity_resource('conpherence-durable-column-view'); require_celerity_resource('font-lato'); - require_celerity_resource('font-slabo'); + require_celerity_resource('font-roboto-slab'); Javelin::initBehavior('workflow', array()); diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -356,35 +356,35 @@ padding-top: 0; } -.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, -.phabricator-remarkup .remarkup-note:first-child { +body .phabricator-remarkup p:first-child, +body .phabricator-remarkup ul.remarkup-list:first-child, +body .phabricator-remarkup ol.remarkup-list:first-child, +body .phabricator-remarkup .remarkup-code-block:first-child, +body .phabricator-remarkup h1.remarkup-header:first-child, +body .phabricator-remarkup h2.remarkup-header:first-child, +body .phabricator-remarkup h3.remarkup-header:first-child, +body .phabricator-remarkup h4.remarkup-header:first-child, +body .phabricator-remarkup h5.remarkup-header:first-child, +body .phabricator-remarkup h6.remarkup-header:first-child, +body .phabricator-remarkup blockquote:first-child, +body .phabricator-remarkup table.remarkup-table:first-child, +body .phabricator-remarkup .remarkup-note: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, -.phabricator-remarkup .remarkup-note:last-child { +body .phabricator-remarkup p:last-child, +body .phabricator-remarkup ul.remarkup-list:last-child, +body .phabricator-remarkup ol.remarkup-list:last-child, +body .phabricator-remarkup .remarkup-code-block:last-child, +body .phabricator-remarkup h1.remarkup-header:last-child, +body .phabricator-remarkup h2.remarkup-header:last-child, +body .phabricator-remarkup h3.remarkup-header:last-child, +body .phabricator-remarkup h4.remarkup-header:last-child, +body .phabricator-remarkup h5.remarkup-header:last-child, +body .phabricator-remarkup h6.remarkup-header:last-child, +body .phabricator-remarkup blockquote:last-child, +body .phabricator-remarkup table.remarkup-table:last-child, +body .phabricator-remarkup .remarkup-note:last-child { margin-bottom: 0; } diff --git a/webroot/rsrc/css/diviner/diviner-shared.css b/webroot/rsrc/css/diviner/diviner-shared.css --- a/webroot/rsrc/css/diviner/diviner-shared.css +++ b/webroot/rsrc/css/diviner/diviner-shared.css @@ -155,9 +155,9 @@ } .diviner-book-item-title { - font-weight: 700; + font-weight: bold; font-size: 15px; - color: {$bluetext}; + color: {$darkbluetext}; } .diviner-book-item-type { diff --git a/webroot/rsrc/css/font/font-roboto-slab.css b/webroot/rsrc/css/font/font-roboto-slab.css new file mode 100644 --- /dev/null +++ b/webroot/rsrc/css/font/font-roboto-slab.css @@ -0,0 +1,14 @@ +/** + * @provides font-roboto-slab + * @requires phui-fontkit-css + */ + +@font-face { + font-family: 'Roboto Slab'; + font-style: normal; + src: local('RobotoSlab'), + url(/rsrc/externals/font/robotoslab/RobotoSlab.woff2) + format('woff2'), + url(/rsrc/externals/font/robotoslab/RobotoSlab.woff) + format('woff'); +} diff --git a/webroot/rsrc/css/font/font-slabo.css b/webroot/rsrc/css/font/font-slabo.css deleted file mode 100644 --- a/webroot/rsrc/css/font/font-slabo.css +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @provides font-slabo - * @requires phui-fontkit-css - */ - -@font-face { - font-family: 'Slabo'; - font-style: normal; - src: local('Slabo'), - local('Slabo-Regular'), - url(/rsrc/externals/font/slabo/Slabo-Regular.woff2) - format('woff2'), - url(/rsrc/externals/font/slabo/Slabo-Regular.woff) - format('woff'); -} diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css --- a/webroot/rsrc/css/phui/phui-document.css +++ b/webroot/rsrc/css/phui/phui-document.css @@ -170,3 +170,11 @@ body .phui-document-view .phui-header-shell.phui-bleed-header { padding: 0; } + +.phui-document-view .phui-property-list-section-header { + padding: 12px 16px 0px; +} + +.phui-document-view .phui-property-list-text-content { + padding: 0; +} diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css --- a/webroot/rsrc/css/phui/phui-fontkit.css +++ b/webroot/rsrc/css/phui/phui-fontkit.css @@ -2,22 +2,16 @@ * @provides phui-fontkit-css */ -/* - Slabo --------------------------------------------------------------------- +/* - Roboto Slab --------------------------------------------------------------- Used as Primary Headers in Object Boxes, Headers in Documents */ .diviner-document-section .phui-header-header { - font-family: 'Slabo', {$fontfamily}; - color: {$darkbluetext}; - font-size: 22px; -} - -.diviner-document-section .phui-header-header { - font-family: 'Slabo', {$fontfamily}; - color: {$darkbluetext}; + font-family: 'Roboto Slab', {$fontfamily}; font-size: 20px; + color: #000; } .phui-document-view .phabricator-remarkup h1.remarkup-header, @@ -26,14 +20,11 @@ .phui-document-view .phabricator-remarkup h4.remarkup-header, .phui-document-view .phabricator-remarkup h5.remarkup-header, .phui-document-view .phabricator-remarkup h6.remarkup-header { - font-family: 'Slabo', {$fontfamily}; - color: #000; + font-family: 'Roboto Slab', {$fontfamily}; } .phui-document-view .phabricator-remarkup h2.remarkup-header { - font-size: 22px; - padding: 24px 24px 8px 0; + padding: 0 24px 8px 0; border-bottom: 1px solid {$thinblueborder}; - color: #000; - margin: 0 0 16px; + margin: 24px 0 16px; } diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css --- a/webroot/rsrc/css/phui/phui-info-view.css +++ b/webroot/rsrc/css/phui/phui-info-view.css @@ -22,6 +22,11 @@ line-height: 1.6em; } +.phui-info-view-body tt { + padding: 0 2px; + background-color: rgba(55,55,55,.1); +} + .phui-info-view-actions { margin-top: -3px; margin-bottom: -4px; diff --git a/webroot/rsrc/externals/font/robotoslab/.DS_Store b/webroot/rsrc/externals/font/robotoslab/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@