diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,11 +7,11 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'bd23b77d', - 'core.pkg.js' => '125d168c', + 'core.pkg.css' => 'ce55724b', + 'core.pkg.js' => '41f5edc5', 'darkconsole.pkg.js' => 'e7393ebb', - 'differential.pkg.css' => 'f89b49b6', - 'differential.pkg.js' => '8c98ce21', + 'differential.pkg.css' => 'df92dc9a', + 'differential.pkg.js' => 'ebef29b1', 'diffusion.pkg.css' => '385e85b3', 'diffusion.pkg.js' => '0115b37c', 'maniphest.pkg.css' => '4845691a', @@ -46,21 +46,21 @@ 'rsrc/css/application/config/config-welcome.css' => '6abd79be', 'rsrc/css/application/config/setup-issue.css' => '631c4e92', 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', - 'rsrc/css/application/conpherence/durable-column.css' => '418234d3', + 'rsrc/css/application/conpherence/durable-column.css' => '09f1eb27', 'rsrc/css/application/conpherence/menu.css' => 'f9f1d143', - 'rsrc/css/application/conpherence/message-pane.css' => '7cbf4cbb', + 'rsrc/css/application/conpherence/message-pane.css' => '02d8d6aa', 'rsrc/css/application/conpherence/notification.css' => '919974b6', - 'rsrc/css/application/conpherence/transaction.css' => '42a457f6', + 'rsrc/css/application/conpherence/transaction.css' => '85d0974c', 'rsrc/css/application/conpherence/update.css' => '1099a660', - 'rsrc/css/application/conpherence/widget-pane.css' => 'eb13f189', + 'rsrc/css/application/conpherence/widget-pane.css' => '6e0e290b', 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 'rsrc/css/application/countdown/timer.css' => '86b7b0a0', 'rsrc/css/application/dashboard/dashboard.css' => 'eb458607', - 'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c', + 'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a', 'rsrc/css/application/differential/add-comment.css' => 'c47f8c40', - 'rsrc/css/application/differential/changeset-view.css' => '582b23ab', + 'rsrc/css/application/differential/changeset-view.css' => '7d07fe43', 'rsrc/css/application/differential/core.css' => '7ac3cabc', - 'rsrc/css/application/differential/phui-inline-comment.css' => 'aa16f165', + 'rsrc/css/application/differential/phui-inline-comment.css' => '22ce520d', 'rsrc/css/application/differential/results-table.css' => '181aa9d9', 'rsrc/css/application/differential/revision-comment.css' => '14b8565a', 'rsrc/css/application/differential/revision-history.css' => '0e8eb855', @@ -107,14 +107,14 @@ 'rsrc/css/application/slowvote/slowvote.css' => '266df6a1', 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', - 'rsrc/css/core/core.css' => 'bbc7187b', - 'rsrc/css/core/remarkup.css' => '67a4ee29', - 'rsrc/css/core/syntax.css' => '6b7b24d9', + 'rsrc/css/core/core.css' => '5c94541a', + 'rsrc/css/core/remarkup.css' => 'cbcf6768', + 'rsrc/css/core/syntax.css' => '9fd11da8', 'rsrc/css/core/z-index.css' => '63689f49', 'rsrc/css/diviner/diviner-shared.css' => '38813222', 'rsrc/css/font/font-awesome.css' => 'e2e712fe', + 'rsrc/css/font/font-lato.css' => '5f05d817', 'rsrc/css/font/font-oswald.css' => 'd5e48ef7', - 'rsrc/css/font/font-source-sans-pro.css' => '8906c07b', 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853', @@ -127,21 +127,21 @@ 'rsrc/css/phui/phui-action-list.css' => '32c388b3', 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5', 'rsrc/css/phui/phui-box.css' => 'a5bb366d', - 'rsrc/css/phui/phui-button.css' => '0d395b42', + 'rsrc/css/phui/phui-button.css' => 'afd64dc3', 'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2', - 'rsrc/css/phui/phui-document.css' => '08f33f08', + 'rsrc/css/phui/phui-document.css' => '7f67a837', 'rsrc/css/phui/phui-feed-story.css' => '153a2ebf', - 'rsrc/css/phui/phui-fontkit.css' => '0ce97d82', + 'rsrc/css/phui/phui-fontkit.css' => 'a230e064', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', - 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => 'fa61bab0', + 'rsrc/css/phui/phui-form.css' => 'ca501a10', + 'rsrc/css/phui/phui-header-view.css' => '44fc449c', '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-list.css' => 'e448b6ba', - 'rsrc/css/phui/phui-object-box.css' => '1ba354f4', - 'rsrc/css/phui/phui-object-item-list-view.css' => '57bd9953', + 'rsrc/css/phui/phui-object-box.css' => 'fc29a33a', + 'rsrc/css/phui/phui-object-item-list-view.css' => 'bf7463f7', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-property-list-view.css' => '1baf23eb', @@ -162,6 +162,14 @@ 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11', 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8', 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d', + 'rsrc/externals/font/lato/Lato-700.woff' => '9a1e2cb1', + 'rsrc/externals/font/lato/Lato-700.woff2' => 'ea903955', + 'rsrc/externals/font/lato/Lato-700italic.woff' => 'f7594053', + 'rsrc/externals/font/lato/Lato-700italic.woff2' => '8e92c6a0', + 'rsrc/externals/font/lato/Lato-italic.woff' => '2ff511fb', + 'rsrc/externals/font/lato/Lato-italic.woff2' => '9e7cacda', + 'rsrc/externals/font/lato/Lato-regular.woff' => 'bdba0324', + 'rsrc/externals/font/lato/Lato-regular.woff2' => '8b23fcc6', 'rsrc/externals/font/oswald/Oswald-Light.eot' => 'c67ac8a7', 'rsrc/externals/font/oswald/Oswald-Light.woff' => '97d56eef', 'rsrc/externals/font/oswald/Oswald-Light.woff2' => '99a9c312', @@ -206,7 +214,7 @@ 'rsrc/externals/javelin/ext/view/__tests__/ViewInterpreter.js' => '7a94d6a5', 'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '6ea96ac9', 'rsrc/externals/javelin/lib/Cookie.js' => '62dfea03', - 'rsrc/externals/javelin/lib/DOM.js' => '6f7962d5', + 'rsrc/externals/javelin/lib/DOM.js' => '147805fa', 'rsrc/externals/javelin/lib/History.js' => 'd4505101', 'rsrc/externals/javelin/lib/JSON.js' => '69adf288', 'rsrc/externals/javelin/lib/Leader.js' => '331b1611', @@ -336,11 +344,12 @@ 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2', 'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8', + 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f', 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', 'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => '16c695bf', - 'rsrc/js/application/conpherence/behavior-menu.js' => 'c0348cac', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c72aa091', + 'rsrc/js/application/conpherence/behavior-menu.js' => 'd3782c93', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', 'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464', @@ -402,7 +411,7 @@ 'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf', 'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8', 'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f', - 'rsrc/js/application/repository/repository-crossreference.js' => '3975b470', + 'rsrc/js/application/repository/repository-crossreference.js' => 'bea81850', 'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08', 'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f', 'rsrc/js/application/transactions/behavior-show-older-transactions.js' => 'dbbf48b6', @@ -462,7 +471,7 @@ 'rsrc/js/core/behavior-object-selector.js' => '49b73b36', 'rsrc/js/core/behavior-oncopy.js' => '2926fff2', 'rsrc/js/core/behavior-phabricator-nav.js' => '56a1ca03', - 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'e32d14ab', + 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => '095ed313', 'rsrc/js/core/behavior-refresh-csrf.js' => '7814b593', 'rsrc/js/core/behavior-remarkup-preview.js' => 'f7379f45', 'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e', @@ -502,15 +511,15 @@ 'conduit-api-css' => '7bc725c4', 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', - 'conpherence-durable-column-view' => '418234d3', + 'conpherence-durable-column-view' => '09f1eb27', 'conpherence-menu-css' => 'f9f1d143', - 'conpherence-message-pane-css' => '7cbf4cbb', + 'conpherence-message-pane-css' => '02d8d6aa', 'conpherence-notification-css' => '919974b6', 'conpherence-thread-manager' => '01774ab2', - 'conpherence-transaction-css' => '42a457f6', + 'conpherence-transaction-css' => '85d0974c', 'conpherence-update-css' => '1099a660', - 'conpherence-widget-pane-css' => 'eb13f189', - 'differential-changeset-view-css' => '582b23ab', + 'conpherence-widget-pane-css' => '6e0e290b', + 'differential-changeset-view-css' => '7d07fe43', 'differential-core-view-css' => '7ac3cabc', 'differential-inline-comment-editor' => 'd4c87bf4', 'differential-results-table-css' => '181aa9d9', @@ -524,14 +533,14 @@ 'diffusion-source-css' => '66fdf661', 'diviner-shared-css' => '38813222', 'font-fontawesome' => 'e2e712fe', + 'font-lato' => '5f05d817', 'font-oswald' => 'd5e48ef7', - 'font-source-sans-pro' => '8906c07b', 'global-drag-and-drop-css' => '697324ad', 'harbormaster-css' => '49d64eb4', 'herald-css' => '826075fa', 'herald-rule-editor' => '271ffdd7', 'herald-test-css' => '778b008e', - 'inline-comment-summary-css' => 'eb5f8e8c', + 'inline-comment-summary-css' => '51efda3a', 'javelin-aphlict' => '5359e785', 'javelin-behavior' => '61cbc29a', 'javelin-behavior-aphlict-dropdown' => '031cee25', @@ -547,7 +556,7 @@ 'javelin-behavior-choose-control' => '6153c708', 'javelin-behavior-config-reorder-fields' => 'b6993408', 'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a', - 'javelin-behavior-conpherence-menu' => 'c0348cac', + 'javelin-behavior-conpherence-menu' => 'd3782c93', 'javelin-behavior-conpherence-pontificate' => '21ba5861', 'javelin-behavior-conpherence-widget-pane' => '93568464', 'javelin-behavior-countdown-timer' => 'e4cc26b3', @@ -575,7 +584,7 @@ 'javelin-behavior-diffusion-locate-file' => '6d3e1947', 'javelin-behavior-diffusion-pull-lastmodified' => '2b228192', 'javelin-behavior-doorkeeper-tag' => 'e5822781', - 'javelin-behavior-durable-column' => '16c695bf', + 'javelin-behavior-durable-column' => 'c72aa091', 'javelin-behavior-error-log' => '6882e80a', 'javelin-behavior-event-all-day' => '38dcf3c8', 'javelin-behavior-fancy-datepicker' => '510b5809', @@ -612,7 +621,7 @@ 'javelin-behavior-phabricator-notification-example' => '8ce821c5', 'javelin-behavior-phabricator-object-selector' => '49b73b36', 'javelin-behavior-phabricator-oncopy' => '2926fff2', - 'javelin-behavior-phabricator-remarkup-assist' => 'e32d14ab', + 'javelin-behavior-phabricator-remarkup-assist' => '095ed313', 'javelin-behavior-phabricator-reveal-content' => '60821bc7', 'javelin-behavior-phabricator-search-typeahead' => '048330fa', 'javelin-behavior-phabricator-show-older-transactions' => 'dbbf48b6', @@ -631,6 +640,7 @@ 'javelin-behavior-project-boards' => 'ba4fa35c', 'javelin-behavior-project-create' => '065227cc', 'javelin-behavior-quicksand-blacklist' => '7927a7d3', + 'javelin-behavior-recurring-edit' => '5f1c4d5f', 'javelin-behavior-refresh-csrf' => '7814b593', 'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf', 'javelin-behavior-releeph-request-state-change' => 'a0b57eb8', @@ -638,7 +648,7 @@ 'javelin-behavior-remarkup-preview' => 'f7379f45', 'javelin-behavior-reorder-applications' => '76b9fc3e', 'javelin-behavior-reorder-columns' => 'e1d25dfb', - 'javelin-behavior-repository-crossreference' => '3975b470', + 'javelin-behavior-repository-crossreference' => 'bea81850', 'javelin-behavior-scrollbar' => '834a1173', 'javelin-behavior-search-reorder-queries' => 'e9581f08', 'javelin-behavior-select-on-click' => '4e3e79a6', @@ -654,7 +664,7 @@ 'javelin-color' => '7e41274a', 'javelin-cookie' => '62dfea03', 'javelin-diffusion-locate-file-source' => 'b42eddc7', - 'javelin-dom' => '6f7962d5', + 'javelin-dom' => '147805fa', 'javelin-dynval' => 'f6555212', 'javelin-event' => '85ea0626', 'javelin-fx' => '54b612ba', @@ -710,7 +720,7 @@ 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'f1971c1c', 'phabricator-content-source-view-css' => '4b8b05d4', - 'phabricator-core-css' => 'bbc7187b', + 'phabricator-core-css' => '5c94541a', 'phabricator-countdown-css' => '86b7b0a0', 'phabricator-dashboard-css' => 'eb458607', 'phabricator-drag-and-drop-file-upload' => '07de8873', @@ -732,7 +742,7 @@ 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '6920d200', - 'phabricator-remarkup-css' => '67a4ee29', + 'phabricator-remarkup-css' => 'cbcf6768', 'phabricator-search-results-css' => 'ce897fb9', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '4f2cd343', @@ -765,27 +775,27 @@ 'phriction-document-css' => 'd1861e06', 'phui-action-panel-css' => '3ee9afd5', 'phui-box-css' => 'a5bb366d', - 'phui-button-css' => '0d395b42', + 'phui-button-css' => 'afd64dc3', 'phui-calendar-css' => 'ccabe893', 'phui-calendar-day-css' => 'd1cf6f93', 'phui-calendar-list-css' => 'c1c7f338', 'phui-calendar-month-css' => '476be7e0', 'phui-crumbs-view-css' => 'ce840ec2', - 'phui-document-view-css' => '08f33f08', + 'phui-document-view-css' => '7f67a837', 'phui-feed-story-css' => '153a2ebf', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => '0ce97d82', - 'phui-form-css' => 'f535f938', + 'phui-fontkit-css' => 'a230e064', + 'phui-form-css' => 'ca501a10', 'phui-form-view-css' => 'a0e8f168', - 'phui-header-view-css' => 'fa61bab0', + 'phui-header-view-css' => '44fc449c', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', 'phui-info-view-css' => '33e54618', - 'phui-inline-comment-view-css' => 'aa16f165', + 'phui-inline-comment-view-css' => '22ce520d', 'phui-list-view-css' => 'e448b6ba', - 'phui-object-box-css' => '1ba354f4', - 'phui-object-item-list-view-css' => '57bd9953', + 'phui-object-box-css' => 'fc29a33a', + 'phui-object-item-list-view-css' => 'bf7463f7', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', 'phui-property-list-view-css' => '1baf23eb', @@ -822,7 +832,7 @@ 'sprite-menu-css' => 'fba663c3', 'sprite-projects-css' => 'b0d9e24f', 'sprite-tokens-css' => '1706b943', - 'syntax-highlighting-css' => '6b7b24d9', + 'syntax-highlighting-css' => '9fd11da8', 'tokens-css' => '3d0f239e', 'typeahead-browse-css' => 'd8581d2c', 'unhandled-exception-css' => '4c96257a', @@ -898,6 +908,15 @@ 'javelin-stratcom', 'javelin-vector', ), + '095ed313' => array( + 'javelin-behavior', + 'javelin-stratcom', + 'javelin-dom', + 'phabricator-phtize', + 'phabricator-textareautils', + 'javelin-workflow', + 'javelin-vector', + ), '0a3f3021' => array( 'javelin-behavior', 'javelin-stratcom', @@ -924,6 +943,13 @@ 'javelin-uri', 'phabricator-textareautils', ), + '147805fa' => array( + 'javelin-magical-init', + 'javelin-install', + 'javelin-util', + 'javelin-vector', + 'javelin-stratcom', + ), '1499a8cb' => array( 'javelin-behavior', 'javelin-stratcom', @@ -937,16 +963,6 @@ 'javelin-request', 'javelin-uri', ), - '16c695bf' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-behavior-device', - 'javelin-scrollbar', - 'javelin-quicksand', - 'phabricator-keyboard-shortcut', - 'conpherence-thread-manager', - ), '1ad0a787' => array( 'javelin-install', 'javelin-reactor', @@ -1058,12 +1074,6 @@ '331b1611' => array( 'javelin-install', ), - '3975b470' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-uri', - ), '3ab51e2c' => array( 'javelin-behavior', 'javelin-behavior-device', @@ -1232,9 +1242,6 @@ 'javelin-request', 'javelin-util', ), - '582b23ab' => array( - 'phui-inline-comment-view-css', - ), 58562350 => array( 'javelin-dom', 'javelin-util', @@ -1293,6 +1300,9 @@ 'phabricator-prefab', 'javelin-json', ), + '5f05d817' => array( + 'phui-fontkit-css', + ), '5fefb143' => array( 'javelin-behavior', 'javelin-dom', @@ -1378,13 +1388,6 @@ 'javelin-util', 'javelin-stratcom', ), - '6f7962d5' => array( - 'javelin-magical-init', - 'javelin-install', - 'javelin-util', - 'javelin-vector', - 'javelin-stratcom', - ), '70baed2f' => array( 'javelin-install', 'javelin-dom', @@ -1440,6 +1443,9 @@ 'javelin-request', 'javelin-router', ), + '7d07fe43' => array( + 'phui-inline-comment-view-css', + ), '7e41274a' => array( 'javelin-install', ), @@ -1503,9 +1509,6 @@ 'javelin-dom', 'javelin-vector', ), - '8906c07b' => array( - 'phui-fontkit-css', - ), '8a41885b' => array( 'javelin-install', 'javelin-dom', @@ -1776,19 +1779,11 @@ 'javelin-util', 'phabricator-shaped-request', ), - 'c0348cac' => array( + 'bea81850' => array( 'javelin-behavior', 'javelin-dom', - 'javelin-util', 'javelin-stratcom', - 'javelin-workflow', - 'javelin-behavior-device', - 'javelin-history', - 'javelin-vector', - 'javelin-scrollbar', - 'phabricator-title', - 'phabricator-shaped-request', - 'conpherence-thread-manager', + 'javelin-uri', ), 'c1700f6f' => array( 'javelin-install', @@ -1797,6 +1792,16 @@ 'javelin-dom', 'javelin-vector', ), + 'c72aa091' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-behavior-device', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + 'conpherence-thread-manager', + ), 'c8e57404' => array( 'javelin-behavior', 'javelin-dom', @@ -1834,6 +1839,20 @@ 'd254d646' => array( 'javelin-util', ), + 'd3782c93' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-workflow', + 'javelin-behavior-device', + 'javelin-history', + 'javelin-vector', + 'javelin-scrollbar', + 'phabricator-title', + 'phabricator-shaped-request', + 'conpherence-thread-manager', + ), 'd4505101' => array( 'javelin-stratcom', 'javelin-install', @@ -1910,15 +1929,6 @@ 'e292eaf4' => array( 'javelin-install', ), - 'e32d14ab' => array( - 'javelin-behavior', - 'javelin-stratcom', - 'javelin-dom', - 'phabricator-phtize', - 'phabricator-textareautils', - 'javelin-workflow', - 'javelin-vector', - ), 'e379b58e' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/celerity/CelerityResourceTransformer.php b/src/applications/celerity/CelerityResourceTransformer.php --- a/src/applications/celerity/CelerityResourceTransformer.php +++ b/src/applications/celerity/CelerityResourceTransformer.php @@ -172,10 +172,10 @@ public static function getCSSVariableMap() { return array( // Fonts - 'basefont' => "13px/1.231 'Segoe UI', 'Segoe UI Web Regular', ". + 'basefont' => "13px/1.231 'Lato', 'Segoe UI Web Regular', ". "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif", - 'fontfamily' => "'Segoe UI', 'Segoe UI Web Regular', ". + 'fontfamily' => "'Lato', 'Segoe UI Web Regular', ". "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif", // Drop Shadow 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 @@ -14,7 +14,6 @@ $crumbs = $this ->buildApplicationCrumbs() - ->setBorder(true) ->addTextCrumb(pht('Welcome')); $nav->setCrumbs($crumbs); @@ -32,7 +31,7 @@ $this->requireResource('config-welcome-css'); $content = pht( - "==== Install Phabricator ====\n\n". + "=== Install Phabricator ===\n\n". "You have successfully installed Phabricator. This screen will guide ". "you through configuration and orientation. ". "These steps are optional, and you can go through them in any order. ". @@ -51,7 +50,7 @@ $setup_href = PhabricatorEnv::getURI('/config/issue/'); if ($issues_resolved) { $content = pht( - "==== Resolve Setup Issues ====\n\n". + "=== Resolve Setup Issues ===\n\n". "You've resolved (or ignored) all outstanding setup issues. ". "You can review issues in the **Config** application, under ". "**[[ %s | Setup Issues ]]**.", @@ -59,7 +58,7 @@ $icon = 'fa-check-square-o green'; } else { $content = pht( - "==== Resolve Setup Issues ====\n\n". + "=== Resolve Setup Issues ===\n\n". "You have some unresolved setup issues to take care of. Click ". "the link in the yellow banner at the top of the screen to see ". "them, or find them in the **Config** application under ". @@ -86,7 +85,7 @@ $have_auth = (bool)$configs; if ($have_auth) { $content = pht( - "==== Login and Registration ====\n\n". + "=== Login and Registration ===\n\n". "You've configured at least one authentication provider, so users ". "can register or log in. ". "To configure more providers or adjust settings, use the ". @@ -95,7 +94,7 @@ $icon = 'fa-check-square-o green'; } else { $content = pht( - "==== Login and Registration ====\n\n". + "=== Login and Registration ===\n\n". "You haven't configured any authentication providers yet. ". "Authentication providers allow users to register accounts and ". "log in to Phabricator. You can configure Phabricator to accept ". @@ -120,7 +119,7 @@ if ($have_config) { $content = pht( - "==== Configure Phabricator Settings ====\n\n". + "=== Configure Phabricator Settings ===\n\n". "You've configured at least one setting from the web interface. ". "To configure more settings later, use the ". "**[[ %s | Config Application ]]**.", @@ -128,7 +127,7 @@ $icon = 'fa-check-square-o green'; } else { $content = pht( - "==== Configure Phabricator Settings ====\n\n". + "=== Configure Phabricator Settings ===\n\n". 'Many aspects of Phabricator are configurable. To explore and '. 'adjust settings, use the **[[ %s | Config Application ]]**.', $config_href); @@ -145,7 +144,7 @@ $have_settings = !empty($prefs); if ($have_settings) { $content = pht( - "==== Adjust Account Settings ====\n\n". + "=== Adjust Account Settings ===\n\n". "You've adjusted at least one setting on your account. ". "To make more adjustments, visit the ". "**[[ %s | Settings Application ]]**.", @@ -153,7 +152,7 @@ $icon = 'fa-check-square-o green'; } else { $content = pht( - "==== Adjust Account Settings ====\n\n". + "=== Adjust Account Settings ===\n\n". 'You can configure settings for your account by clicking the '. 'wrench icon in the main menu bar, or visiting the '. '**[[ %s | Settings Application ]]** directly.', @@ -173,7 +172,7 @@ 'PhabricatorHomeApplication'); if ($have_dashboard) { $content = pht( - "==== Customize Home Page ====\n\n". + "=== Customize Home Page ===\n\n". "You've installed a default dashboard to replace this welcome screen ". "on the home page. ". "You can still visit the welcome screen here at any time if you ". @@ -185,7 +184,7 @@ $icon = 'fa-check-square-o green'; } else { $content = pht( - "==== Customize Home Page ====\n\n". + "=== Customize Home Page ===\n\n". "When you're done setting things up, you can create a custom ". "dashboard and install it. Your dashboard will replace this ". "welcome screen on the Phabricator home page. ". @@ -209,7 +208,7 @@ $apps_href = PhabricatorEnv::getURI('/applications/'); $content = pht( - "==== Explore Applications ====\n\n". + "=== Explore Applications ===\n\n". "Phabricator is a large suite of applications that work together to ". "help you develop software, manage tasks, and communicate. A few of ". "the most commonly used applications are pinned to the left navigation ". @@ -229,7 +228,7 @@ $support_href = PhabricatorEnv::getDoclink('Give Feedback! Get Support!'); $content = pht( - "==== Need Help with Setup? ====\n\n". + "=== Need Help with Setup? ===\n\n". 'Having trouble getting something set up? See '. '**[[ %s | Give Feedback! Get Support! ]]** for ways to get in touch '. 'to get answers to questions, report bugs, and request features.', @@ -255,7 +254,7 @@ $request, 'fa-gear', pht( - "==== Quick Start: Code Review ====\n\n". + "=== Quick Start: Code Review ===\n\n". "Review code with **[[ %s | Differential ]]**. ". "Engineers can use Differential to share, review, and approve ". "changes to source code. ". @@ -283,7 +282,7 @@ $request, 'fa-anchor', pht( - "==== Quick Start: Bugs and Tasks ====\n\n". + "=== Quick Start: Bugs and Tasks ===\n\n". "Track bugs and tasks in Phabricator with ". "**[[ %s | Maniphest ]]**. ". "Users in all roles can use Maniphest to manage current and ". @@ -304,7 +303,7 @@ $request, 'fa-camera-retro', pht( - "==== Quick Start: Design Review ====\n\n". + "=== Quick Start: Design Review ===\n\n". "Review proposed designs with **[[ %s | Pholio ]]**. ". "Designers can use Pholio to share images of what they're working on ". "and show off things they've made. ". @@ -328,7 +327,7 @@ $request, 'fa-code', pht( - "==== Quick Start: Repositories ====\n\n". + "=== Quick Start: Repositories ===\n\n". "Manage and browse source code repositories with ". "**[[ %s | Diffusion ]]**. ". "Engineers can use Diffusion to browse and audit source code. ". @@ -368,8 +367,6 @@ return id(new PHUIDocumentView()) ->setHeader($header) ->setFluid(true) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) - // ->setSidenav($sidenav) ->appendChild($setup_header) ->appendChild($setup) ->appendChild($explore_header) diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php --- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php +++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php @@ -109,7 +109,6 @@ protected function getTagContent() { $column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN; - require_celerity_resource('font-source-sans-pro'); Javelin::initBehavior( 'durable-column', diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php --- a/src/applications/conpherence/view/ConpherenceLayoutView.php +++ b/src/applications/conpherence/view/ConpherenceLayoutView.php @@ -60,9 +60,6 @@ require_celerity_resource('conpherence-message-pane-css'); require_celerity_resource('conpherence-widget-pane-css'); - require_celerity_resource('phui-fontkit-css'); - require_celerity_resource('font-source-sans-pro'); - $layout_id = celerity_generate_unique_node_id(); $selected_id = null; @@ -174,7 +171,7 @@ javelin_tag( 'div', array( - 'class' => 'conpherence-message-pane phui-font-source-sans', + 'class' => 'conpherence-message-pane', 'id' => 'conpherence-message-pane', 'sigil' => 'conpherence-message-pane', ), diff --git a/src/applications/diffusion/view/DiffusionReadmeView.php b/src/applications/diffusion/view/DiffusionReadmeView.php --- a/src/applications/diffusion/view/DiffusionReadmeView.php +++ b/src/applications/diffusion/view/DiffusionReadmeView.php @@ -113,8 +113,7 @@ ->setFluid(true) ->appendChild($readme_content) ->addClass('diffusion-readme-view') - ->setHeader($header) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS); + ->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 @@ -88,7 +88,6 @@ ->setBook($book->getTitle(), $group_name) ->setHeader($header) ->addClass('diviner-view') - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) ->appendChild($properties); if ($atom) { diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php --- a/src/applications/diviner/controller/DivinerBookController.php +++ b/src/applications/diviner/controller/DivinerBookController.php @@ -41,7 +41,6 @@ $document = new PHUIDocumentView(); $document->setHeader($header); $document->addClass('diviner-view'); - $document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS); $atoms = id(new DivinerAtomQuery()) ->setViewer($viewer) diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php --- a/src/applications/diviner/controller/DivinerMainController.php +++ b/src/applications/diviner/controller/DivinerMainController.php @@ -33,7 +33,6 @@ $document = new PHUIDocumentView(); $document->setHeader($header); - $document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS); $document->addClass('diviner-view'); if ($books) { diff --git a/src/applications/legalpad/controller/LegalpadDocumentEditController.php b/src/applications/legalpad/controller/LegalpadDocumentEditController.php --- a/src/applications/legalpad/controller/LegalpadDocumentEditController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentEditController.php @@ -245,8 +245,7 @@ $preview = id(new PHUIRemarkupPreviewPanel()) ->setHeader(pht('Document Preview')) ->setPreviewURI($this->getApplicationURI('document/preview/')) - ->setControlID('document-text') - ->setSkin('document'); + ->setControlID('document-text'); return $this->buildApplicationPage( array( 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 @@ -266,7 +266,6 @@ $content = id(new PHUIDocumentView()) ->addClass('legalpad') ->setHeader($header) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) ->appendChild( array( $signed_status, diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php --- a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php +++ b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php @@ -136,7 +136,6 @@ $document = id(new PHUIDocumentView()) ->setHeader($header) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) ->appendChild($info_view) ->appendChild($content_box); 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 @@ -217,7 +217,6 @@ } $page_content = id(new PHUIDocumentView()) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) ->setHeader($header) ->appendChild( array( diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php --- a/src/applications/phriction/controller/PhrictionEditController.php +++ b/src/applications/phriction/controller/PhrictionEditController.php @@ -264,8 +264,7 @@ $preview = id(new PHUIRemarkupPreviewPanel()) ->setHeader(pht('Document Preview')) ->setPreviewURI('/phriction/preview/') - ->setControlID('document-textarea') - ->setSkin('document'); + ->setControlID('document-textarea'); $crumbs = $this->buildApplicationCrumbs(); if ($document->getID()) { diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php --- a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php +++ b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php @@ -131,7 +131,6 @@ $document = id(new PHUIDocumentView()) ->setHeader($header) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS) ->appendChild($content_box); $crumbs = $this->buildApplicationCrumbs(); diff --git a/src/applications/uiexample/examples/PHUIDocumentExample.php b/src/applications/uiexample/examples/PHUIDocumentExample.php --- a/src/applications/uiexample/examples/PHUIDocumentExample.php +++ b/src/applications/uiexample/examples/PHUIDocumentExample.php @@ -193,7 +193,6 @@ $content->setTopNav($topnav); $content->setSidenav($sidenav); $content->appendChild($document); - $content->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS); return $content; } 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 @@ -173,6 +173,7 @@ require_celerity_resource('phui-form-css'); require_celerity_resource('phabricator-standard-page-view'); require_celerity_resource('conpherence-durable-column-view'); + require_celerity_resource('font-lato'); Javelin::initBehavior('workflow', array()); diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php --- a/src/view/phui/PHUIDocumentView.php +++ b/src/view/phui/PHUIDocumentView.php @@ -5,7 +5,6 @@ /* For mobile displays, where do you want the sidebar */ const NAV_BOTTOM = 'nav_bottom'; const NAV_TOP = 'nav_top'; - const FONT_SOURCE_SANS = 'source-sans'; private $offset; private $header; @@ -15,7 +14,6 @@ private $bookname; private $bookdescription; private $mobileview; - private $fontKit; private $fluid; public function setOffset($offset) { @@ -53,11 +51,6 @@ return $this; } - public function setFontKit($kit) { - $this->fontKit = $kit; - return $this; - } - public function setFluid($fluid) { $this->fluid = $fluid; return $this; @@ -81,15 +74,6 @@ protected function getTagContent() { require_celerity_resource('phui-document-view-css'); - if ($this->fontKit) { - require_celerity_resource('phui-fontkit-css'); - } - - switch ($this->fontKit) { - case self::FONT_SOURCE_SANS: - require_celerity_resource('font-source-sans-pro'); - break; - } $classes = array(); $classes[] = 'phui-document-view'; @@ -135,16 +119,7 @@ $this->bookName); } - if ($this->fontKit) { - $main_content = phutil_tag( - 'div', - array( - 'class' => 'phui-font-'.$this->fontKit, - ), - $this->renderChildren()); - } else { - $main_content = $this->renderChildren(); - } + $main_content = $this->renderChildren(); if ($book) { $this->header->setSubheader($book); diff --git a/src/view/phui/PHUIRemarkupPreviewPanel.php b/src/view/phui/PHUIRemarkupPreviewPanel.php --- a/src/view/phui/PHUIRemarkupPreviewPanel.php +++ b/src/view/phui/PHUIRemarkupPreviewPanel.php @@ -9,7 +9,6 @@ private $loadingText; private $controlID; private $previewURI; - private $skin = 'default'; protected function canAppendChild() { return false; @@ -35,24 +34,6 @@ return $this; } - public function setSkin($skin) { - static $skins = array( - 'default' => true, - 'document' => true, - ); - - if (empty($skins[$skin])) { - throw new Exception( - pht( - "Invalid skin '%s'. Valid skins are: %s.", - $skin, - implode(', ', array_keys($skins)))); - } - - $this->skin = $skin; - return $this; - } - protected function getTagName() { return 'div'; } @@ -61,10 +42,6 @@ $classes = array(); $classes[] = 'phui-remarkup-preview'; - if ($this->skin) { - $classes[] = 'phui-remarkup-preview-skin-'.$this->skin; - } - return array( 'class' => $classes, ); @@ -116,23 +93,12 @@ $content = array($header, $preview); - switch ($this->skin) { - case 'document': - $content = id(new PHUIDocumentView()) - ->appendChild($content) - ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS); - break; - default: - $content = id(new PHUIBoxView()) - ->appendChild($content) - ->setBorder(true) - ->addMargin(PHUI::MARGIN_LARGE) - ->addPadding(PHUI::PADDING_LARGE) - ->addClass('phui-panel-preview'); - break; - } - - return $content; + return id(new PHUIBoxView()) + ->appendChild($content) + ->setBorder(true) + ->addMargin(PHUI::MARGIN_LARGE) + ->addPadding(PHUI::PADDING_LARGE) + ->addClass('phui-panel-preview'); } } diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -250,13 +250,16 @@ } .conpherence-durable-column-transactions .conpherence-transaction-detail -.conpherence-transaction-header .conpherence-transaction-info, -.conpherence-transaction-header .epoch-link { +.conpherence-transaction-header .conpherence-transaction-info { color: {$lightbluetext}; float: none; font-size: 12px; } +.conpherence-transaction-header .epoch-link { + color: {$lightgreytext}; +} + .conpherence-durable-column-transactions .conpherence-transaction-detail .conpherence-transaction-header .phui-link-person { margin: 0 8px 0 0; diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -283,7 +283,7 @@ .conpherence-message-pane .conpherence-transaction-info, .conpherence-message-pane .anchor-link, .conpherence-message-pane .phabricator-content-source-view { - color: {$lightbluetext}; + color: {$lightgreytext}; line-height: 16px; font-size: 12px; } diff --git a/webroot/rsrc/css/application/conpherence/transaction.css b/webroot/rsrc/css/application/conpherence/transaction.css --- a/webroot/rsrc/css/application/conpherence/transaction.css +++ b/webroot/rsrc/css/application/conpherence/transaction.css @@ -12,7 +12,6 @@ .conpherence-transaction-header .phui-link-person { font-weight: bold; - color: {$darkbluetext}; } .conpherence-transaction-view.date-marker { @@ -22,7 +21,7 @@ position: relative; top: -11px; background-color: #fff; - color: {$darkbluetext}; + color: #000; font-weight: bold; } diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css --- a/webroot/rsrc/css/application/conpherence/widget-pane.css +++ b/webroot/rsrc/css/application/conpherence/widget-pane.css @@ -47,7 +47,10 @@ } .conpherence-widget-pane .widgets-header .phui-header-shell { - padding: 8px; + padding: 6px 8px; +} + +.conpherence-widget-pane .widgets-header .phui-header-header { font-size: 14px; } 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 @@ -3,7 +3,7 @@ */ .phabricator-remarkup { - line-height: 1.45em; + line-height: 1.51em; } .phabricator-remarkup p { @@ -259,7 +259,7 @@ } .phabricator-remarkup-toc-header { - font-size: 14px; + font-size: 13px; line-height: 13px; color: {$darkbluetext}; font-weight: bold; @@ -280,7 +280,7 @@ .phabricator-remarkup-toc ul li { padding: 0; margin: 0; - font-size: 13px; + font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/webroot/rsrc/css/font/font-lato.css b/webroot/rsrc/css/font/font-lato.css new file mode 100644 --- /dev/null +++ b/webroot/rsrc/css/font/font-lato.css @@ -0,0 +1,52 @@ +/** + * @provides font-lato + * @requires phui-fontkit-css + */ + +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato'), + local('Lato-regular'), + url(/rsrc/externals/font/lato/Lato-regular.woff2) + format('woff2'), + url(/rsrc/externals/font/lato/Lato-regular.woff) + format('woff'); +} + +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + src: local('Lato Italic'), + local('Lato-italic'), + url(/rsrc/externals/font/lato/Lato-italic.woff2) + format('woff2'), + url(/rsrc/externals/font/lato/Lato-italic.woff) + format('woff'); +} + +@font-face{ + font-family: 'Lato'; + font-weight: 700; + font-style: normal; + src: local('Lato 700'), + local('Lato-700'), + url(/rsrc/externals/font/lato/Lato-700.woff2) + format('woff2'), + url(/rsrc/externals/font/lato/Lato-700.woff) + format('woff'); +} + +@font-face{ + font-family: 'Lato'; + font-weight: 700; + font-style: italic; + src: local('Lato 700 Italic'), + local('Lato-700italic'), + url(/rsrc/externals/font/lato/Lato-700italic.woff2) + format('woff2'), + url(/rsrc/externals/font/lato/Lato-700italic.woff) + format('woff'); +} diff --git a/webroot/rsrc/css/font/font-source-sans-pro.css b/webroot/rsrc/css/font/font-source-sans-pro.css deleted file mode 100644 --- a/webroot/rsrc/css/font/font-source-sans-pro.css +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @provides font-source-sans-pro - * @requires phui-fontkit-css - */ - -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 400; - src: local('Source Sans Pro'), - local('SourceSansPro-Regular'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-Regular.woff2) - format('woff2'), - url(/rsrc/externals/font/sourcesans/SourceSansPro.woff) - format('woff'); -} - -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 600; - src: local('Source Sans Pro Semibold'), - local('SourceSansPro-Semibold'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-Semibold.woff2) - format('woff2'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-Semibold.woff) - format('woff'); -} - -@font-face{ - font-family: 'Source Sans Pro'; - font-weight: 400; - font-style: italic; - font-stretch: normal; - src: local('Source Sans Pro It'), - local('SourceSansPro-It'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-It.woff2) - format('woff2'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-It.woff) - format('woff'); -} - -@font-face{ - font-family: 'Source Sans Pro'; - font-weight: 700; - font-style: italic; - font-stretch: normal; - src: local('Source Sans Pro Semibold It'), - local('SourceSansPro-SemiboldIt'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-SemiboldIt.woff2) - format('woff'), - url(/rsrc/externals/font/sourcesans/SourceSansPro-SemiboldIt.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 @@ -33,6 +33,10 @@ margin: 16px; } +.phui-crumbs-view + .phui-document-fluid .phui-document-view { + margin-top: 0; +} + .device-desktop .phui-document-view.phui-offset-view { max-width: 800px; } @@ -103,6 +107,7 @@ .phui-document-content .phabricator-remarkup { padding: 16px; + font-size: 14px; } .phui-document-view .phui-header-action-links .phui-mobile-menu { @@ -151,6 +156,7 @@ border-left: 1px solid {$thinblueborder}; padding: 16px 12px; margin: 0; + font-size: 12px; } .device-phone .phui-document-view .phabricator-remarkup.remarkup-has-toc { 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,117 +2,6 @@ * @provides phui-fontkit-css */ -/* - Source Sans --------------------------------------------------------------- - - Used in Documents, Conpherence - -*/ - -.phui-font-source-sans { - font-family: 'Source Sans Pro', {$fontfamily}; - font-size: 15px; - font-weight: 400; - line-height: 20px; -} - -.phui-font-source-sans.conpherence-message-pane, -.phui-font-source-sans.conpherence-message-pane .remarkup-assist-textarea, -.conpherence-durable-column-body, -.conpherence-durable-column-body .remarkup-assist-textarea { - font-family: 'Source Sans Pro', {$fontfamily}; - font-weight: 400; - font-size: 14px; - line-height: 18px; -} - -.PhabricatorMonospaced .phui-document-view .phui-font-source-sans, -.phui-document-view .phui-font-source-sans .phabricator-remarkup - .remarkup-code-block .remarkup-code { - font-size: 11px; - line-height: 1.3em; -} - -.platform-windows .PhabricatorMonospaced .phui-document-view - .phui-font-source-sans, -.platform-windows .phui-document-view .phui-font-source-sans - .phabricator-remarkup .remarkup-code-block .remarkup-code { - font-size: 12px; - line-height: 1.3em; -} - -.phui-font-source-sans .phabricator-remarkup h1.remarkup-header, -.phui-font-source-sans .phabricator-remarkup h2.remarkup-header, -.phui-font-source-sans .phabricator-remarkup h3.remarkup-header, -.phui-font-source-sans .phabricator-remarkup h4.remarkup-header, -.phui-font-source-sans .phabricator-remarkup h5.remarkup-header, -.phui-font-source-sans .phabricator-remarkup h6.remarkup-header { - font-family: 'Oswald', {$fontfamily}; - color: {$darkbluetext}; - font-weight: 400; -} - -.phui-font-source-sans .phabricator-remarkup h2.remarkup-header { - padding: 24px 24px 8px 0; - border-bottom: 1px solid {$lightblueborder}; - font-size: 22px; - font-weight: 400; - color: {$darkbluetext}; - margin: 0 0 16px; -} - -.phui-font-source-sans .phabricator-remarkup tt.remarkup-monospaced { - font-size: 13px; - padding: 1px 3px 2px; -} - -.diviner-view .phui-font-source-sans .phui-property-list-section, -.legalpad .phui-font-source-sans .phui-property-list-section { - border-bottom: 1px solid {$thinblueborder}; - background: {$lightgreybackground}; -} - -.legalpad .phui-font-source-sans .phui-property-list-section-header { - padding: 16px 4px 0 16px; -} - -.phui-font-source-sans .phui-property-list-text-content { - background: {$lightgreybackground}; - padding: 0; -} - -.phui-font-source-sans .phui-property-list-container { - padding-bottom: 6px; - font: {$basefont}; - line-height: 16px; -} - -.phui-font-source-sans .phabricator-action-view { - font: {$basefont}; - font-size: 12px; -} - -body .phui-font-source-sans - .phui-header-shell.phui-bleed-header { - padding: 0; - } - -body .phui-font-source-sans - .phui-header-shell.phui-bleed-header .phui-header-view { - font-size: 20px; - font-weight: normal; -} - -.phui-font-source-sans .phui-form-view { - font: {$basefont}; - font-weight: normal; -} - -.phui-font-source-sans .phui-tag-shade .phui-icon-view { - font-size: 13px; - top: 4px; - left: 6px; -} - /* - Oswald -------------------------------------------------------------------- Used as Primary Headers in Object Boxes, Headers in Documents @@ -126,7 +15,18 @@ font-weight: 400; } -.phui-font-source-sans .phui-header-header { +.phui-document-view .phui-header-header { + font-family: 'Oswald', {$fontfamily}; + color: {$darkbluetext}; + font-weight: 400; +} + +.phui-document-view .phabricator-remarkup h1.remarkup-header, +.phui-document-view .phabricator-remarkup h2.remarkup-header, +.phui-document-view .phabricator-remarkup h3.remarkup-header, +.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: 'Oswald', {$fontfamily}; color: {$darkbluetext}; font-weight: 400; diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -70,7 +70,7 @@ .phui-header-header { font-size: 18px; - font-weight: 500; + font-weight: bold; line-height: 24px; color: {$darkbluetext}; } @@ -86,7 +86,7 @@ .device-desktop .phui-header-view .phui-header-header a:hover { text-decoration: none; - color: {$fire}; + color: {$blue}; } .phui-header-view .phui-header-action-links { @@ -152,9 +152,6 @@ .phui-header-subheader .phui-header-status-dark { color: {$sh-indigotext}; - background-color: {$sh-indigobackground}; - padding: 2px 8px; - border-radius: 3px; margin-right: 8px; } @@ -164,17 +161,11 @@ .phui-header-subheader .phui-header-status-red { color: {$sh-redtext}; - background-color: {$sh-redbackground}; - padding: 2px 8px; - border-radius: 3px; margin-right: 8px; } .phui-header-subheader .phui-header-status-green { color: {$sh-greentext}; - background-color: {$sh-greenbackground}; - padding: 2px 8px; - border-radius: 3px; margin-right: 8px; } diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -129,7 +129,7 @@ font-size: 13px; margin: 0; color: {$darkbluetext}; - font-weight: 500; + font-weight: bold; } .phui-object-box .phui-object-box .phui-header-shell { diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -73,12 +73,13 @@ } .phui-object-item-name { - font-weight: 500; padding: 8px 8px 0; white-space: nowrap; word-wrap: break-word; overflow: hidden; text-overflow: ellipsis; + font-weight: bold; + -webkit-font-smoothing: antialiased; } .device-phone .phui-object-item-name { diff --git a/webroot/rsrc/externals/font/sourcesans/LICENSE b/webroot/rsrc/externals/font/lato/LICENSE.txt rename from webroot/rsrc/externals/font/sourcesans/LICENSE rename to webroot/rsrc/externals/font/lato/LICENSE.txt --- a/webroot/rsrc/externals/font/sourcesans/LICENSE +++ b/webroot/rsrc/externals/font/lato/LICENSE.txt @@ -1,8 +1,8 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" This Font Software is licensed under the SIL Open Font License, Version 1.1. - -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL ----------------------------------------------------------- @@ -18,7 +18,7 @@ The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/webroot/rsrc/externals/font/lato/Lato-700.woff b/webroot/rsrc/externals/font/lato/Lato-700.woff new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@