diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 0934e971bb..114f7120e6 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -818,7 +818,7 @@ celerity_register_resource_map(array( ), 'aphront-contextbar-view-css' => array( - 'uri' => '/res/1ddb40ec/rsrc/css/aphront/context-bar.css', + 'uri' => '/res/46c6248f/rsrc/css/aphront/context-bar.css', 'type' => 'css', 'requires' => array( @@ -3018,7 +3018,7 @@ celerity_register_resource_map(array( ), 'phabricator-action-list-view-css' => array( - 'uri' => '/res/ade71822/rsrc/css/layout/phabricator-action-list-view.css', + 'uri' => '/res/89534fee/rsrc/css/layout/phabricator-action-list-view.css', 'type' => 'css', 'requires' => array( @@ -3474,7 +3474,7 @@ celerity_register_resource_map(array( ), 'phabricator-timeline-view-css' => array( - 'uri' => '/res/09567421/rsrc/css/layout/phabricator-timeline-view.css', + 'uri' => '/res/c3898a8b/rsrc/css/layout/phabricator-timeline-view.css', 'type' => 'css', 'requires' => array( @@ -3805,7 +3805,7 @@ celerity_register_resource_map(array( ), 'phui-object-box-css' => array( - 'uri' => '/res/3c1129d2/rsrc/css/phui/phui-object-box.css', + 'uri' => '/res/9e56634a/rsrc/css/phui/phui-object-box.css', 'type' => 'css', 'requires' => array( @@ -4184,7 +4184,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '9d16ff0b' => + 'a20e63b0' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4233,7 +4233,7 @@ celerity_register_resource_map(array( 41 => 'phabricator-tag-view-css', 42 => 'phui-list-view-css', ), - 'uri' => '/res/pkg/9d16ff0b/core.pkg.css', + 'uri' => '/res/pkg/a20e63b0/core.pkg.css', 'type' => 'css', ), '64eeda79' => @@ -4425,15 +4425,15 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => '9d16ff0b', - 'aphront-error-view-css' => '9d16ff0b', - 'aphront-list-filter-view-css' => '9d16ff0b', - 'aphront-pager-view-css' => '9d16ff0b', - 'aphront-panel-view-css' => '9d16ff0b', - 'aphront-table-view-css' => '9d16ff0b', - 'aphront-tokenizer-control-css' => '9d16ff0b', - 'aphront-tooltip-css' => '9d16ff0b', - 'aphront-typeahead-control-css' => '9d16ff0b', + 'aphront-dialog-view-css' => 'a20e63b0', + 'aphront-error-view-css' => 'a20e63b0', + 'aphront-list-filter-view-css' => 'a20e63b0', + 'aphront-pager-view-css' => 'a20e63b0', + 'aphront-panel-view-css' => 'a20e63b0', + 'aphront-table-view-css' => 'a20e63b0', + 'aphront-tokenizer-control-css' => 'a20e63b0', + 'aphront-tooltip-css' => 'a20e63b0', + 'aphront-typeahead-control-css' => 'a20e63b0', 'differential-changeset-view-css' => 'b55e602f', 'differential-core-view-css' => 'b55e602f', 'differential-inline-comment-editor' => '5e9e5c4e', @@ -4447,7 +4447,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'b55e602f', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '9d16ff0b', + 'global-drag-and-drop-css' => 'a20e63b0', 'inline-comment-summary-css' => 'b55e602f', 'javelin-aphlict' => '64eeda79', 'javelin-behavior' => '9564fa17', @@ -4522,56 +4522,56 @@ celerity_register_resource_map(array( 'javelin-util' => '9564fa17', 'javelin-vector' => '9564fa17', 'javelin-workflow' => '9564fa17', - 'lightbox-attachment-css' => '9d16ff0b', + 'lightbox-attachment-css' => 'a20e63b0', 'maniphest-task-summary-css' => '49898640', - 'phabricator-action-list-view-css' => '9d16ff0b', - 'phabricator-application-launch-view-css' => '9d16ff0b', + 'phabricator-action-list-view-css' => 'a20e63b0', + 'phabricator-application-launch-view-css' => 'a20e63b0', 'phabricator-busy' => '64eeda79', 'phabricator-content-source-view-css' => 'b55e602f', - 'phabricator-core-css' => '9d16ff0b', - 'phabricator-crumbs-view-css' => '9d16ff0b', + 'phabricator-core-css' => 'a20e63b0', + 'phabricator-crumbs-view-css' => 'a20e63b0', 'phabricator-drag-and-drop-file-upload' => '5e9e5c4e', 'phabricator-dropdown-menu' => '64eeda79', 'phabricator-file-upload' => '64eeda79', - 'phabricator-filetree-view-css' => '9d16ff0b', - 'phabricator-flag-css' => '9d16ff0b', + 'phabricator-filetree-view-css' => 'a20e63b0', + 'phabricator-flag-css' => 'a20e63b0', 'phabricator-hovercard' => '64eeda79', - 'phabricator-jump-nav' => '9d16ff0b', + 'phabricator-jump-nav' => 'a20e63b0', 'phabricator-keyboard-shortcut' => '64eeda79', 'phabricator-keyboard-shortcut-manager' => '64eeda79', - 'phabricator-main-menu-view' => '9d16ff0b', + 'phabricator-main-menu-view' => 'a20e63b0', 'phabricator-menu-item' => '64eeda79', - 'phabricator-nav-view-css' => '9d16ff0b', + 'phabricator-nav-view-css' => 'a20e63b0', 'phabricator-notification' => '64eeda79', - 'phabricator-notification-css' => '9d16ff0b', - 'phabricator-notification-menu-css' => '9d16ff0b', + 'phabricator-notification-css' => 'a20e63b0', + 'phabricator-notification-menu-css' => 'a20e63b0', 'phabricator-object-selector-css' => 'b55e602f', 'phabricator-phtize' => '64eeda79', 'phabricator-prefab' => '64eeda79', 'phabricator-project-tag-css' => '49898640', - 'phabricator-property-list-view-css' => '9d16ff0b', - 'phabricator-remarkup-css' => '9d16ff0b', + 'phabricator-property-list-view-css' => 'a20e63b0', + 'phabricator-remarkup-css' => 'a20e63b0', 'phabricator-shaped-request' => '5e9e5c4e', - 'phabricator-side-menu-view-css' => '9d16ff0b', - 'phabricator-standard-page-view' => '9d16ff0b', - 'phabricator-tag-view-css' => '9d16ff0b', + 'phabricator-side-menu-view-css' => 'a20e63b0', + 'phabricator-standard-page-view' => 'a20e63b0', + 'phabricator-tag-view-css' => 'a20e63b0', 'phabricator-textareautils' => '64eeda79', 'phabricator-tooltip' => '64eeda79', - 'phabricator-transaction-view-css' => '9d16ff0b', - 'phabricator-zindex-css' => '9d16ff0b', - 'phui-button-css' => '9d16ff0b', - 'phui-form-css' => '9d16ff0b', - 'phui-form-view-css' => '9d16ff0b', - 'phui-header-view-css' => '9d16ff0b', - 'phui-icon-view-css' => '9d16ff0b', - 'phui-list-view-css' => '9d16ff0b', - 'phui-object-item-list-view-css' => '9d16ff0b', - 'phui-spacing-css' => '9d16ff0b', - 'sprite-apps-large-css' => '9d16ff0b', - 'sprite-gradient-css' => '9d16ff0b', - 'sprite-icons-css' => '9d16ff0b', - 'sprite-menu-css' => '9d16ff0b', - 'sprite-status-css' => '9d16ff0b', - 'syntax-highlighting-css' => '9d16ff0b', + 'phabricator-transaction-view-css' => 'a20e63b0', + 'phabricator-zindex-css' => 'a20e63b0', + 'phui-button-css' => 'a20e63b0', + 'phui-form-css' => 'a20e63b0', + 'phui-form-view-css' => 'a20e63b0', + 'phui-header-view-css' => 'a20e63b0', + 'phui-icon-view-css' => 'a20e63b0', + 'phui-list-view-css' => 'a20e63b0', + 'phui-object-item-list-view-css' => 'a20e63b0', + 'phui-spacing-css' => 'a20e63b0', + 'sprite-apps-large-css' => 'a20e63b0', + 'sprite-gradient-css' => 'a20e63b0', + 'sprite-icons-css' => 'a20e63b0', + 'sprite-menu-css' => 'a20e63b0', + 'sprite-status-css' => 'a20e63b0', + 'syntax-highlighting-css' => 'a20e63b0', ), )); diff --git a/webroot/rsrc/css/aphront/context-bar.css b/webroot/rsrc/css/aphront/context-bar.css index 72cd4eccc0..374e19b740 100644 --- a/webroot/rsrc/css/aphront/context-bar.css +++ b/webroot/rsrc/css/aphront/context-bar.css @@ -3,18 +3,15 @@ */ .aphront-contextbar-view { - background: #efefef; - padding: 6px 2em; - border-bottom: 1px solid #dfdfdf; -} - -.aphront-contextbar-core { + background: #fff; + padding: 8px 16px; + border-bottom: 1px solid {$lightblueborder}; } .aphront-contextbar-content { padding-top: 5px; font-size: 13px; - color: {$greytext}; + color: {$bluetext}; } .aphront-contextbar-buttons { @@ -23,7 +20,7 @@ .aphront-contextbar-buttons label { font-weight: bold; - color: {$greytext}; + color: {$bluetext}; } .aphront-contextbar-buttons a { diff --git a/webroot/rsrc/css/layout/phabricator-action-list-view.css b/webroot/rsrc/css/layout/phabricator-action-list-view.css index 56e33c93f1..26491cd600 100644 --- a/webroot/rsrc/css/layout/phabricator-action-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-action-list-view.css @@ -78,7 +78,7 @@ .phabricator-action-view button.phabricator-action-view-item, .phabricator-action-view-item { - padding: 1px 0 1px 34px; + padding: 1px 0 1px 28px; line-height: 20px; display: block; font-size: 12px; @@ -91,12 +91,12 @@ height: 14px; position: absolute; top: 5px; - left: 13px; + left: 8px; } .device-desktop .phabricator-action-view:hover .phabricator-action-view-item { text-decoration: none; - background-color: #3875d7; + background-color: {$blue}; color: #ffffff; } diff --git a/webroot/rsrc/css/layout/phabricator-timeline-view.css b/webroot/rsrc/css/layout/phabricator-timeline-view.css index 3a2b9e7c3a..1d76705a6a 100644 --- a/webroot/rsrc/css/layout/phabricator-timeline-view.css +++ b/webroot/rsrc/css/layout/phabricator-timeline-view.css @@ -6,6 +6,10 @@ padding: 0 16px; } +.device-phone .phabricator-timeline-view { + padding: 0; +} + .phabricator-timeline-group { border-width: 0 3px; border-style: solid; @@ -43,8 +47,8 @@ } .phabricator-timeline-title { - line-height: 28px; - min-height: 28px; + line-height: 18px; + min-height: 18px; position: relative; } @@ -89,7 +93,7 @@ } .phabricator-timeline-title { - padding: 0 5px; + padding: 5px; overflow-x: auto; overflow-y: hidden; } @@ -107,7 +111,6 @@ overflow-x: auto; } - .device .phabricator-timeline-event-view { min-height: 23px; position: relative; diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css index a699987adb..c75259c483 100644 --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -32,3 +32,11 @@ margin-bottom: -12px; border-width: 0 0 0 1px; } + +.device-phone .phui-object-box { + margin-top: 0; +} + +.device-phone .phui-object-box + .phui-object-box { + border-top: none; +}