From 503f4137890dafc5a7e7661f39748a239bf696d5 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 14 Oct 2013 09:40:05 -0700 Subject: [PATCH] Clean up spacing on Diffusion headers Summary: This adds some controllable space between paths in Diffusion headers. Fixes T3951 Test Plan: Tested new links in diffusion. Reviewers: epriestley Reviewed By: epriestley CC: Korvin, epriestley, aran Maniphest Tasks: T3951 Differential Revision: https://secure.phabricator.com/D7304 --- src/__celerity_resource_map__.php | 92 +++++++++---------- .../controller/DiffusionController.php | 16 +++- webroot/rsrc/css/phui/phui-header-view.css | 10 ++ 3 files changed, 68 insertions(+), 50 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 61e4cf9c93..86fc6e6e89 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -3815,7 +3815,7 @@ celerity_register_resource_map(array( ), 'phui-header-view-css' => array( - 'uri' => '/res/d4cec460/rsrc/css/phui/phui-header-view.css', + 'uri' => '/res/d6ca0939/rsrc/css/phui/phui-header-view.css', 'type' => 'css', 'requires' => array( @@ -4257,7 +4257,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '1f32154b' => + '7ad8c5a4' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4306,7 +4306,7 @@ celerity_register_resource_map(array( 41 => 'phabricator-tag-view-css', 42 => 'phui-list-view-css', ), - 'uri' => '/res/pkg/1f32154b/core.pkg.css', + 'uri' => '/res/pkg/7ad8c5a4/core.pkg.css', 'type' => 'css', ), '8fafb027' => @@ -4498,15 +4498,15 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => '1f32154b', - 'aphront-error-view-css' => '1f32154b', - 'aphront-list-filter-view-css' => '1f32154b', - 'aphront-pager-view-css' => '1f32154b', - 'aphront-panel-view-css' => '1f32154b', - 'aphront-table-view-css' => '1f32154b', - 'aphront-tokenizer-control-css' => '1f32154b', - 'aphront-tooltip-css' => '1f32154b', - 'aphront-typeahead-control-css' => '1f32154b', + 'aphront-dialog-view-css' => '7ad8c5a4', + 'aphront-error-view-css' => '7ad8c5a4', + 'aphront-list-filter-view-css' => '7ad8c5a4', + 'aphront-pager-view-css' => '7ad8c5a4', + 'aphront-panel-view-css' => '7ad8c5a4', + 'aphront-table-view-css' => '7ad8c5a4', + 'aphront-tokenizer-control-css' => '7ad8c5a4', + 'aphront-tooltip-css' => '7ad8c5a4', + 'aphront-typeahead-control-css' => '7ad8c5a4', 'differential-changeset-view-css' => '4dc2311c', 'differential-core-view-css' => '4dc2311c', 'differential-inline-comment-editor' => '5e9e5c4e', @@ -4520,7 +4520,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '4dc2311c', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '1f32154b', + 'global-drag-and-drop-css' => '7ad8c5a4', 'inline-comment-summary-css' => '4dc2311c', 'javelin-aphlict' => '8fafb027', 'javelin-behavior' => '9564fa17', @@ -4595,56 +4595,56 @@ celerity_register_resource_map(array( 'javelin-util' => '9564fa17', 'javelin-vector' => '9564fa17', 'javelin-workflow' => '9564fa17', - 'lightbox-attachment-css' => '1f32154b', + 'lightbox-attachment-css' => '7ad8c5a4', 'maniphest-task-summary-css' => '49898640', - 'phabricator-action-list-view-css' => '1f32154b', - 'phabricator-application-launch-view-css' => '1f32154b', + 'phabricator-action-list-view-css' => '7ad8c5a4', + 'phabricator-application-launch-view-css' => '7ad8c5a4', 'phabricator-busy' => '8fafb027', 'phabricator-content-source-view-css' => '4dc2311c', - 'phabricator-core-css' => '1f32154b', - 'phabricator-crumbs-view-css' => '1f32154b', + 'phabricator-core-css' => '7ad8c5a4', + 'phabricator-crumbs-view-css' => '7ad8c5a4', 'phabricator-drag-and-drop-file-upload' => '5e9e5c4e', 'phabricator-dropdown-menu' => '8fafb027', 'phabricator-file-upload' => '8fafb027', - 'phabricator-filetree-view-css' => '1f32154b', - 'phabricator-flag-css' => '1f32154b', + 'phabricator-filetree-view-css' => '7ad8c5a4', + 'phabricator-flag-css' => '7ad8c5a4', 'phabricator-hovercard' => '8fafb027', - 'phabricator-jump-nav' => '1f32154b', + 'phabricator-jump-nav' => '7ad8c5a4', 'phabricator-keyboard-shortcut' => '8fafb027', 'phabricator-keyboard-shortcut-manager' => '8fafb027', - 'phabricator-main-menu-view' => '1f32154b', + 'phabricator-main-menu-view' => '7ad8c5a4', 'phabricator-menu-item' => '8fafb027', - 'phabricator-nav-view-css' => '1f32154b', + 'phabricator-nav-view-css' => '7ad8c5a4', 'phabricator-notification' => '8fafb027', - 'phabricator-notification-css' => '1f32154b', - 'phabricator-notification-menu-css' => '1f32154b', + 'phabricator-notification-css' => '7ad8c5a4', + 'phabricator-notification-menu-css' => '7ad8c5a4', 'phabricator-object-selector-css' => '4dc2311c', 'phabricator-phtize' => '8fafb027', 'phabricator-prefab' => '8fafb027', 'phabricator-project-tag-css' => '49898640', - 'phabricator-remarkup-css' => '1f32154b', + 'phabricator-remarkup-css' => '7ad8c5a4', 'phabricator-shaped-request' => '5e9e5c4e', - 'phabricator-side-menu-view-css' => '1f32154b', - 'phabricator-standard-page-view' => '1f32154b', - 'phabricator-tag-view-css' => '1f32154b', + 'phabricator-side-menu-view-css' => '7ad8c5a4', + 'phabricator-standard-page-view' => '7ad8c5a4', + 'phabricator-tag-view-css' => '7ad8c5a4', 'phabricator-textareautils' => '8fafb027', 'phabricator-tooltip' => '8fafb027', - 'phabricator-transaction-view-css' => '1f32154b', - 'phabricator-zindex-css' => '1f32154b', - 'phui-button-css' => '1f32154b', - 'phui-form-css' => '1f32154b', - 'phui-form-view-css' => '1f32154b', - 'phui-header-view-css' => '1f32154b', - 'phui-icon-view-css' => '1f32154b', - 'phui-list-view-css' => '1f32154b', - 'phui-object-item-list-view-css' => '1f32154b', - 'phui-property-list-view-css' => '1f32154b', - 'phui-spacing-css' => '1f32154b', - 'sprite-apps-large-css' => '1f32154b', - 'sprite-gradient-css' => '1f32154b', - 'sprite-icons-css' => '1f32154b', - 'sprite-menu-css' => '1f32154b', - 'sprite-status-css' => '1f32154b', - 'syntax-highlighting-css' => '1f32154b', + 'phabricator-transaction-view-css' => '7ad8c5a4', + 'phabricator-zindex-css' => '7ad8c5a4', + 'phui-button-css' => '7ad8c5a4', + 'phui-form-css' => '7ad8c5a4', + 'phui-form-view-css' => '7ad8c5a4', + 'phui-header-view-css' => '7ad8c5a4', + 'phui-icon-view-css' => '7ad8c5a4', + 'phui-list-view-css' => '7ad8c5a4', + 'phui-object-item-list-view-css' => '7ad8c5a4', + 'phui-property-list-view-css' => '7ad8c5a4', + 'phui-spacing-css' => '7ad8c5a4', + 'sprite-apps-large-css' => '7ad8c5a4', + 'sprite-gradient-css' => '7ad8c5a4', + 'sprite-icons-css' => '7ad8c5a4', + 'sprite-menu-css' => '7ad8c5a4', + 'sprite-status-css' => '7ad8c5a4', + 'syntax-highlighting-css' => '7ad8c5a4', ), )); diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php index 3241f46328..7778375028 100644 --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -166,6 +166,12 @@ abstract class DiffusionController extends PhabricatorController { $path = $drequest->getPath(); $path_parts = array_filter(explode('/', trim($path, '/'))); + $divider = phutil_tag( + 'span', + array( + 'class' => 'phui-header-divider'), + '/'); + $links = array(); if ($path_parts) { $links[] = phutil_tag( @@ -177,11 +183,11 @@ abstract class DiffusionController extends PhabricatorController { 'path' => '', )), ), - 'r'.$drequest->getRepository()->getCallsign().'/'); + 'r'.$drequest->getRepository()->getCallsign()); + $links[] = $divider; $accum = ''; $last_key = last_key($path_parts); foreach ($path_parts as $key => $part) { - $links[] = ' '; $accum .= '/'.$part; if ($key === $last_key) { $links[] = $part; @@ -195,11 +201,13 @@ abstract class DiffusionController extends PhabricatorController { 'path' => $accum.'/', )), ), - $part.'/'); + $part); + $links[] = $divider; } } } else { - $links[] = 'r'.$drequest->getRepository()->getCallsign().'/'; + $links[] = 'r'.$drequest->getRepository()->getCallsign(); + $links[] = $divider; } return $links; diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css index b311e446d4..5c62dfc6a7 100644 --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -43,6 +43,16 @@ body .phui-header-shell.phui-bleed-header color: {$darkbluetext}; } +.phui-header-view a { + color: {$darkbluetext}; +} + +.phui-header-divider { + margin: 0 4px; + font-weight: normal; + color: {$lightbluetext}; +} + body.device-phone .phui-header-view { padding: 12px 8px; }