1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 06:20:56 +01:00

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
This commit is contained in:
Chad Little 2014-09-24 09:10:28 -07:00
parent 212b0d29c5
commit 8ebe9cea92
3 changed files with 10 additions and 7 deletions

View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => '3317a3ad', 'core.pkg.css' => 'fe2446e9',
'core.pkg.js' => 'cbdbd552', 'core.pkg.js' => 'cbdbd552',
'darkconsole.pkg.js' => 'df001cab', 'darkconsole.pkg.js' => 'df001cab',
'differential.pkg.css' => '36884139', 'differential.pkg.css' => '36884139',
@ -39,7 +39,7 @@ return array(
'rsrc/css/application/base/main-menu-view.css' => 'aceca0e9', 'rsrc/css/application/base/main-menu-view.css' => 'aceca0e9',
'rsrc/css/application/base/notification-menu.css' => '6aa0a74b', 'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
'rsrc/css/application/base/phabricator-application-launch-view.css' => '5d71008f', '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/chatlog/chatlog.css' => '852140ff',
'rsrc/css/application/config/config-options.css' => '7fedf08b', 'rsrc/css/application/config/config-options.css' => '7fedf08b',
'rsrc/css/application/config/config-template.css' => '25d446d6', 'rsrc/css/application/config/config-template.css' => '25d446d6',
@ -739,7 +739,7 @@ return array(
'phabricator-side-menu-view-css' => 'a2ccd7bd', 'phabricator-side-menu-view-css' => 'a2ccd7bd',
'phabricator-slowvote-css' => '266df6a1', 'phabricator-slowvote-css' => '266df6a1',
'phabricator-source-code-view-css' => '7d346aa4', 'phabricator-source-code-view-css' => '7d346aa4',
'phabricator-standard-page-view' => 'dd860661', 'phabricator-standard-page-view' => '1b000ec8',
'phabricator-textareautils' => '5c93c52c', 'phabricator-textareautils' => '5c93c52c',
'phabricator-title' => '5c1c758c', 'phabricator-title' => '5c1c758c',
'phabricator-tooltip' => '3915d490', 'phabricator-tooltip' => '3915d490',

View file

@ -352,7 +352,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
phutil_tag_div('phabricator-standard-page-body', array( phutil_tag_div('phabricator-standard-page-body', array(
($console ? hsprintf('<darkconsole />') : null), ($console ? hsprintf('<darkconsole />') : null),
parent::getBody(), parent::getBody(),
phutil_tag('div', array('style' => 'clear: both;')),
$this->renderFooter(), $this->renderFooter(),
)), )),
)); ));
@ -508,7 +507,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
return phutil_tag( return phutil_tag(
'div', 'div',
array( array(
'class' => 'phabricator-standard-page-footer', 'class' => 'phabricator-standard-page-footer grouped',
), ),
$foot); $foot);
} }

View file

@ -15,12 +15,16 @@
.phabricator-standard-page-footer { .phabricator-standard-page-footer {
text-align: right; text-align: right;
margin: 0 16px; margin: 4px 16px;
padding: 8px 0; padding: 12px 0;
border-top: 1px solid {$lightgreyborder}; border-top: 1px solid {$lightgreyborder};
color: {$lightgreytext}; color: {$lightgreytext};
} }
.has-local-nav + .phabricator-standard-page-footer {
margin-left: 221px;
}
.keyboard-shortcut-help td, .keyboard-shortcut-help td,
.keyboard-shortcut-help th { .keyboard-shortcut-help th {
padding: 8px; padding: 8px;