revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 01:08:50 +02:00
Code Issues Releases Wiki Activity

Switch fluid to fixed on PHUITwoColumnView

Browse source 
Summary: We don't ever set fluid, since it already is fluid, also no CSS. Add an actual fixed version.

Test Plan: For use in Instances.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18336
This commit is contained in:
Chad Little 2017-08-03 19:52:35 -07:00
parent fedf08743f
commit 68ab9b2642
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/celerity/map.php
View file

@ -9,7 +9,7 @@ return array(
'names' => array( 'names' => array(
'conpherence.pkg.css' => 'e68cf1fa', 'conpherence.pkg.css' => 'e68cf1fa',
'conpherence.pkg.js' => 'b5b51108', 'conpherence.pkg.js' => 'b5b51108',
'core.pkg.css' => '851ae625', 'core.pkg.css' => 'cc0772c6',
'core.pkg.js' => '5d80e0db', 'core.pkg.js' => '5d80e0db',
'darkconsole.pkg.js' => '1f9a31bc', 'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '45951e9e', 'differential.pkg.css' => '45951e9e',
@ -178,7 +178,7 @@ return array(
'rsrc/css/phui/phui-status.css' => 'd5263e49', 'rsrc/css/phui/phui-status.css' => 'd5263e49',
'rsrc/css/phui/phui-tag-view.css' => 'b4719c50', 'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca', 'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
'rsrc/css/phui/phui-two-column-view.css' => '5b8cd553', 'rsrc/css/phui/phui-two-column-view.css' => 'ae38a939',
'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5', 'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455', 'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92', 'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
@ -874,7 +874,7 @@ return array(
'phui-tag-view-css' => 'b4719c50', 'phui-tag-view-css' => 'b4719c50',
'phui-theme-css' => '9f261c6b', 'phui-theme-css' => '9f261c6b',
'phui-timeline-view-css' => 'f21db7ca', 'phui-timeline-view-css' => 'f21db7ca',
'phui-two-column-view-css' => '5b8cd553', 'phui-two-column-view-css' => 'ae38a939',
'phui-workboard-color-css' => '783cdff5', 'phui-workboard-color-css' => '783cdff5',
'phui-workboard-view-css' => '3bc85455', 'phui-workboard-view-css' => '3bc85455',
'phui-workcard-view-css' => 'cca5fa92', 'phui-workcard-view-css' => 'cca5fa92',

10
src/view/phui/PHUITwoColumnView.php
View file

@ -6,7 +6,7 @@ final class PHUITwoColumnView extends AphrontTagView {
private $sideColumn = null; private $sideColumn = null;
private $navigation; private $navigation;
private $display; private $display;
private $fluid; private $fixed;
private $header; private $header;
private $subheader; private $subheader;
private $footer; private $footer;
@ -71,8 +71,8 @@ final class PHUITwoColumnView extends AphrontTagView {
return $this->curtain; return $this->curtain;
} }
public function setFluid($fluid) { public function setFixed($fixed) {
$this->fluid = $fluid; $this->fixed = $fixed;
return $this; return $this;
} }
@ -94,8 +94,8 @@ final class PHUITwoColumnView extends AphrontTagView {
$classes[] = 'phui-two-column-view'; $classes[] = 'phui-two-column-view';
$classes[] = $this->getDisplay(); $classes[] = $this->getDisplay();
if ($this->fluid) { if ($this->fixed) {
$classes[] = 'phui-two-column-fluid'; $classes[] = 'phui-two-column-fixed';
} }
if ($this->tabs) { if ($this->tabs) {

5
webroot/rsrc/css/phui/phui-two-column-view.css
View file

@ -2,6 +2,11 @@
* @provides phui-two-column-view-css * @provides phui-two-column-view-css
*/ */
.phui-two-column-fixed {
max-width: 1140px;
margin: 0 auto;
}
.phui-two-column-view .phui-two-column-header { .phui-two-column-view .phui-two-column-header {
background-color: {$page.content}; background-color: {$page.content};
border-bottom: 1px solid rgba({$alphagrey}, .12); border-bottom: 1px solid rgba({$alphagrey}, .12);