From 1c5b31d397410fb308fa78f5b2ac26e03c680bcd Mon Sep 17 00:00:00 2001 From: epriestley Date: Fri, 10 Jun 2011 10:18:27 -0700 Subject: [PATCH] Keep menubar from spazzing out in narrow screens Summary: If you resize your window to be very narrow, the menu bar spazzes out right now. Prevent it from developing all sorts of weird internal linewrapping. Test Plan: Narrowed my browser window, header didn't spaz out. Reviewed By: jungejason Reviewers: aran, jungejason, tuomaspelkonen CC: aran, jungejason Differential Revision: 428 --- src/__celerity_resource_map__.php | 68 +++++++++---------- .../standard/PhabricatorStandardPageView.php | 2 +- .../application/base/standard-page-view.css | 2 + 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 34e1ec06f8..4607a3d87e 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1032,7 +1032,7 @@ celerity_register_resource_map(array( ), 'phabricator-standard-page-view' => array( - 'uri' => '/res/b90eb694/rsrc/css/application/base/standard-page-view.css', + 'uri' => '/res/fe3c801d/rsrc/css/application/base/standard-page-view.css', 'type' => 'css', 'requires' => array( @@ -1103,7 +1103,23 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/33f413ef/typeahead.pkg.js', 'type' => 'js', ), - 'be386945' => + 'c8f4dac5' => + array ( + 'name' => 'workflow.pkg.js', + 'symbols' => + array ( + 0 => 'javelin-mask', + 1 => 'javelin-workflow', + 2 => 'javelin-behavior-workflow', + 3 => 'javelin-behavior-aphront-form-disable-on-submit', + 4 => 'phabricator-keyboard-shortcut-manager', + 5 => 'phabricator-keyboard-shortcut', + 6 => 'javelin-behavior-phabricator-keyboard-shortcuts', + ), + 'uri' => '/res/pkg/c8f4dac5/workflow.pkg.js', + 'type' => 'js', + ), + 'ca51195b' => array ( 'name' => 'core.pkg.css', 'symbols' => @@ -1124,25 +1140,9 @@ celerity_register_resource_map(array( 13 => 'phabricator-remarkup-css', 14 => 'syntax-highlighting-css', ), - 'uri' => '/res/pkg/be386945/core.pkg.css', + 'uri' => '/res/pkg/ca51195b/core.pkg.css', 'type' => 'css', ), - 'c8f4dac5' => - array ( - 'name' => 'workflow.pkg.js', - 'symbols' => - array ( - 0 => 'javelin-mask', - 1 => 'javelin-workflow', - 2 => 'javelin-behavior-workflow', - 3 => 'javelin-behavior-aphront-form-disable-on-submit', - 4 => 'phabricator-keyboard-shortcut-manager', - 5 => 'phabricator-keyboard-shortcut', - 6 => 'javelin-behavior-phabricator-keyboard-shortcuts', - ), - 'uri' => '/res/pkg/c8f4dac5/workflow.pkg.js', - 'type' => 'js', - ), 'da416e1c' => array ( 'name' => 'differential.pkg.js', @@ -1179,15 +1179,15 @@ celerity_register_resource_map(array( ), 'reverse' => array ( - 'aphront-crumbs-view-css' => 'be386945', - 'aphront-dialog-view-css' => 'be386945', - 'aphront-form-view-css' => 'be386945', - 'aphront-list-filter-view-css' => 'be386945', - 'aphront-panel-view-css' => 'be386945', - 'aphront-side-nav-view-css' => 'be386945', - 'aphront-table-view-css' => 'be386945', - 'aphront-tokenizer-control-css' => 'be386945', - 'aphront-typeahead-control-css' => 'be386945', + 'aphront-crumbs-view-css' => 'ca51195b', + 'aphront-dialog-view-css' => 'ca51195b', + 'aphront-form-view-css' => 'ca51195b', + 'aphront-list-filter-view-css' => 'ca51195b', + 'aphront-panel-view-css' => 'ca51195b', + 'aphront-side-nav-view-css' => 'ca51195b', + 'aphront-table-view-css' => 'ca51195b', + 'aphront-tokenizer-control-css' => 'ca51195b', + 'aphront-typeahead-control-css' => 'ca51195b', 'differential-changeset-view-css' => '0e6e36aa', 'differential-core-view-css' => '0e6e36aa', 'differential-revision-add-comment-css' => '0e6e36aa', @@ -1224,13 +1224,13 @@ celerity_register_resource_map(array( 'javelin-util' => 'db95a6d0', 'javelin-vector' => 'db95a6d0', 'javelin-workflow' => 'c8f4dac5', - 'phabricator-core-buttons-css' => 'be386945', - 'phabricator-core-css' => 'be386945', - 'phabricator-directory-css' => 'be386945', + 'phabricator-core-buttons-css' => 'ca51195b', + 'phabricator-core-css' => 'ca51195b', + 'phabricator-directory-css' => 'ca51195b', 'phabricator-keyboard-shortcut' => 'c8f4dac5', 'phabricator-keyboard-shortcut-manager' => 'c8f4dac5', - 'phabricator-remarkup-css' => 'be386945', - 'phabricator-standard-page-view' => 'be386945', - 'syntax-highlighting-css' => 'be386945', + 'phabricator-remarkup-css' => 'ca51195b', + 'phabricator-standard-page-view' => 'ca51195b', + 'syntax-highlighting-css' => 'ca51195b', ), )); diff --git a/src/view/page/standard/PhabricatorStandardPageView.php b/src/view/page/standard/PhabricatorStandardPageView.php index d4fc62e6fc..542ca810ab 100644 --- a/src/view/page/standard/PhabricatorStandardPageView.php +++ b/src/view/page/standard/PhabricatorStandardPageView.php @@ -206,7 +206,7 @@ class PhabricatorStandardPageView extends AphrontPageView { // in the execution workflow. if ($user && $user->getPHID()) { $login_stuff = - 'Logged in as '.phutil_render_tag( + phutil_render_tag( 'a', array( 'href' => '/p/'.$user->getUsername().'/', diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index 7a9e988e52..c19d94e907 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -42,6 +42,7 @@ border-bottom: 6px solid transparent; padding-top: 14px; padding-bottom: 4px; + white-space: nowrap; } .phabricator-logo { @@ -82,6 +83,7 @@ td.phabricator-login-details { vertical-align: middle; padding: 0px 24px; font-size: 12px; + white-space: nowrap; } .phabricator-page-foot {