From 8ebe9cea92d630743d786ecdf10ccff1b2b1ef88 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Wed, 24 Sep 2014 09:10:28 -0700
Subject: [PATCH] Shift footer when on page with sidenav

Summary: Fixes T6168, adds spacing when navigation is present.

Test Plan: Tested Chrome, IE 9, 10. Numerous pages.

Reviewers: epriestley, btrahan

Reviewed By: btrahan

Subscribers: epriestley, Korvin

Maniphest Tasks: T6168

Differential Revision: https://secure.phabricator.com/D10543
---
 resources/celerity/map.php                               | 6 +++---
 src/view/page/PhabricatorStandardPageView.php            | 3 +--
 webroot/rsrc/css/application/base/standard-page-view.css | 8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index db9d161802..9e171e90a6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '3317a3ad',
+    'core.pkg.css' => 'fe2446e9',
     'core.pkg.js' => 'cbdbd552',
     'darkconsole.pkg.js' => 'df001cab',
     'differential.pkg.css' => '36884139',
@@ -39,7 +39,7 @@ return array(
     'rsrc/css/application/base/main-menu-view.css' => 'aceca0e9',
     'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '5d71008f',
-    'rsrc/css/application/base/standard-page-view.css' => 'dd860661',
+    'rsrc/css/application/base/standard-page-view.css' => '1b000ec8',
     'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
     'rsrc/css/application/config/config-options.css' => '7fedf08b',
     'rsrc/css/application/config/config-template.css' => '25d446d6',
@@ -739,7 +739,7 @@ return array(
     'phabricator-side-menu-view-css' => 'a2ccd7bd',
     'phabricator-slowvote-css' => '266df6a1',
     'phabricator-source-code-view-css' => '7d346aa4',
-    'phabricator-standard-page-view' => 'dd860661',
+    'phabricator-standard-page-view' => '1b000ec8',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => '5c1c758c',
     'phabricator-tooltip' => '3915d490',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index bcf274817b..9af3affb75 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -352,7 +352,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
         phutil_tag_div('phabricator-standard-page-body', array(
           ($console ? hsprintf('<darkconsole />') : null),
           parent::getBody(),
-          phutil_tag('div', array('style' => 'clear: both;')),
           $this->renderFooter(),
         )),
       ));
@@ -508,7 +507,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
     return phutil_tag(
       'div',
       array(
-        'class' => 'phabricator-standard-page-footer',
+        'class' => 'phabricator-standard-page-footer grouped',
       ),
       $foot);
   }
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
index 301137c338..2a13e05bac 100644
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -15,12 +15,16 @@
 
 .phabricator-standard-page-footer {
   text-align: right;
-  margin: 0 16px;
-  padding: 8px 0;
+  margin: 4px 16px;
+  padding: 12px 0;
   border-top: 1px solid {$lightgreyborder};
   color: {$lightgreytext};
 }
 
+.has-local-nav + .phabricator-standard-page-footer {
+  margin-left: 221px;
+}
+
 .keyboard-shortcut-help td,
 .keyboard-shortcut-help th {
   padding: 8px;