archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Remove 'setShadow' from PHUIBoxView

Browse Source 
Summary: Removes setShadow, uses setBorder instead

Test Plan: Tested multicolumn, feed, search box, many other areas. Things look less 3d.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D8192
This commit is contained in:
Chad Little
2014-02-10 16:04:42 -08:00
parent 1830868007
commit 1ac28a7127
14 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/celerity/map.php
View File

@@ -26,7 +26,7 @@ return array(
'rsrc/css/aphront/error-view.css' => '16cd9949', 'rsrc/css/aphront/error-view.css' => '16cd9949',
'rsrc/css/aphront/lightbox-attachment.css' => '686f8885', 'rsrc/css/aphront/lightbox-attachment.css' => '686f8885',
'rsrc/css/aphront/list-filter-view.css' => 'ef989c67', 'rsrc/css/aphront/list-filter-view.css' => 'ef989c67',
'rsrc/css/aphront/multi-column.css' => '05bbd016', 'rsrc/css/aphront/multi-column.css' => '6f7573f0',
'rsrc/css/aphront/notification.css' => '6901121e', 'rsrc/css/aphront/notification.css' => '6901121e',
'rsrc/css/aphront/pager-view.css' => '2e3539af', 'rsrc/css/aphront/pager-view.css' => '2e3539af',
'rsrc/css/aphront/panel-view.css' => '5846dfa2', 'rsrc/css/aphront/panel-view.css' => '5846dfa2',
@@ -126,7 +126,7 @@ return array(
'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0', 'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0',
'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814', 'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814',
'rsrc/css/layout/phabricator-timeline-view.css' => 'f4f846c4', 'rsrc/css/layout/phabricator-timeline-view.css' => 'f4f846c4',
'rsrc/css/phui/phui-box.css' => '21da4d8c', 'rsrc/css/phui/phui-box.css' => '6c21bd6a',
'rsrc/css/phui/phui-button.css' => '8784a966', 'rsrc/css/phui/phui-button.css' => '8784a966',
'rsrc/css/phui/phui-document.css' => '143b2ac8', 'rsrc/css/phui/phui-document.css' => '143b2ac8',
'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf', 'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf',
@@ -483,7 +483,7 @@ return array(
'aphront-dialog-view-css' => 'dd9db96c', 'aphront-dialog-view-css' => 'dd9db96c',
'aphront-error-view-css' => '16cd9949', 'aphront-error-view-css' => '16cd9949',
'aphront-list-filter-view-css' => 'ef989c67', 'aphront-list-filter-view-css' => 'ef989c67',
'aphront-multi-column-view-css' => '05bbd016', 'aphront-multi-column-view-css' => '6f7573f0',
'aphront-notes' => '6acadd3f', 'aphront-notes' => '6acadd3f',
'aphront-pager-view-css' => '2e3539af', 'aphront-pager-view-css' => '2e3539af',
'aphront-panel-view-css' => '5846dfa2', 'aphront-panel-view-css' => '5846dfa2',
@@ -737,7 +737,7 @@ return array(
'phortune-credit-card-form-css' => 'b25b4beb', 'phortune-credit-card-form-css' => 'b25b4beb',
'phrequent-css' => 'ffc185ad', 'phrequent-css' => 'ffc185ad',
'phriction-document-css' => 'b0309d8e', 'phriction-document-css' => 'b0309d8e',
'phui-box-css' => '21da4d8c', 'phui-box-css' => '6c21bd6a',
'phui-button-css' => '8784a966', 'phui-button-css' => '8784a966',
'phui-document-view-css' => '143b2ac8', 'phui-document-view-css' => '143b2ac8',
'phui-feed-story-css' => '3a59c2cf', 'phui-feed-story-css' => '3a59c2cf',

2
src/applications/search/controller/PhabricatorApplicationSearchController.php
View File

@@ -262,7 +262,7 @@ final class PhabricatorApplicationSearchController
$pager_box = id(new PHUIBoxView()) $pager_box = id(new PHUIBoxView())
->addPadding(PHUI::PADDING_MEDIUM) ->addPadding(PHUI::PADDING_MEDIUM)
->addMargin(PHUI::MARGIN_LARGE) ->addMargin(PHUI::MARGIN_LARGE)
->setShadow(true) ->setBorder(true)
->appendChild($pager); ->appendChild($pager);
$nav->appendChild($pager_box); $nav->appendChild($pager_box);
} }

2
src/applications/search/controller/PhabricatorSearchController.php
View File

@@ -133,7 +133,7 @@ final class PhabricatorSearchController
return id(new PHUIBoxView()) return id(new PHUIBoxView())
->addMargin(PHUI::MARGIN_LARGE) ->addMargin(PHUI::MARGIN_LARGE)
->addPadding(PHUI::PADDING_LARGE) ->addPadding(PHUI::PADDING_LARGE)
->setShadow(true) ->setBorder(true)
->appendChild($results) ->appendChild($results)
->addClass('phabricator-search-result-box'); ->addClass('phabricator-search-result-box');
} }

8
src/applications/uiexample/examples/PHUIBoxExample.php
View File

@@ -44,17 +44,17 @@ final class PHUIBoxExample extends PhabricatorUIExample {
array( array(
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($content1) ->appendChild($content1)
->setShadow(true) ->setBorder(true)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->addMargin(PHUI::MARGIN_LARGE_BOTTOM), ->addMargin(PHUI::MARGIN_LARGE_BOTTOM),
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($content2) ->appendChild($content2)
->setShadow(true) ->setBorder(true)
->addPadding(PHUI::PADDING_MEDIUM) ->addPadding(PHUI::PADDING_MEDIUM)
->addMargin(PHUI::MARGIN_LARGE_BOTTOM), ->addMargin(PHUI::MARGIN_LARGE_BOTTOM),
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($content3) ->appendChild($content3)
->setShadow(true) ->setBorder(true)
->addPadding(PHUI::PADDING_LARGE) ->addPadding(PHUI::PADDING_LARGE)
->addMargin(PHUI::MARGIN_LARGE_BOTTOM)); ->addMargin(PHUI::MARGIN_LARGE_BOTTOM));
@@ -85,7 +85,7 @@ final class PHUIBoxExample extends PhabricatorUIExample {
->setHeader(pht('Plain Box with space')); ->setHeader(pht('Plain Box with space'));
$head3 = id(new PHUIHeaderView()) $head3 = id(new PHUIHeaderView())
->setHeader(pht('Shadow Box with space')); ->setHeader(pht('Border Box with space'));
$head4 = id(new PHUIHeaderView()) $head4 = id(new PHUIHeaderView())
->setHeader(pht('PHUIObjectBoxView')); ->setHeader(pht('PHUIObjectBoxView'));

12
src/applications/uiexample/examples/PHUIIconExample.php
View File

@@ -120,7 +120,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild($actionview) ->appendChild($actionview)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->setShadow(true)); ->setBorder(true));
$layout2 = $layout2 =
array( array(
@@ -128,7 +128,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild(array($person1, $person2, $person3)) ->appendChild(array($person1, $person2, $person3))
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->setShadow(true)); ->setBorder(true));
$layout2a = $layout2a =
array( array(
@@ -136,7 +136,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild(array($person4, $person5, $person6)) ->appendChild(array($person4, $person5, $person6))
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->setShadow(true)); ->setBorder(true));
$layout3 = $layout3 =
array( array(
@@ -144,7 +144,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild($tokenview) ->appendChild($tokenview)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->setShadow(true)); ->setBorder(true));
$layout4 = $layout4 =
array( array(
@@ -152,7 +152,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild(array($card1, $card2, $card3, $card4, $card5)) ->appendChild(array($card1, $card2, $card3, $card4, $card5))
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_MEDIUM) ->addPadding(PHUI::PADDING_MEDIUM)
->setShadow(true)); ->setBorder(true));
$layout5 = $layout5 =
array( array(
@@ -160,7 +160,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
->appendChild($loginview) ->appendChild($loginview)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_MEDIUM) ->addPadding(PHUI::PADDING_MEDIUM)
->setShadow(true)); ->setBorder(true));
$head1 = id(new PHUIHeaderView()) $head1 = id(new PHUIHeaderView())
->setHeader(pht('Action Icons!')); ->setHeader(pht('Action Icons!'));

10
src/applications/uiexample/examples/PHUIListExample.php
View File

@@ -211,35 +211,35 @@ final class PHUIListExample extends PhabricatorUIExample {
->appendChild($unstyled) ->appendChild($unstyled)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->addPadding(PHUI::PADDING_SMALL) ->addPadding(PHUI::PADDING_SMALL)
->setShadow(true)); ->setBorder(true));
$layout2 = $layout2 =
array( array(
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($sidenav) ->appendChild($sidenav)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->setShadow(true)); ->setBorder(true));
$layout3 = $layout3 =
array( array(
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($topnav) ->appendChild($topnav)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->setShadow(true)); ->setBorder(true));
$layout4 = $layout4 =
array( array(
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($actionmenu) ->appendChild($actionmenu)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->setShadow(true)); ->setBorder(true));
$layout5 = $layout5 =
array( array(
id(new PHUIBoxView()) id(new PHUIBoxView())
->appendChild($statustabs) ->appendChild($statustabs)
->addMargin(PHUI::MARGIN_MEDIUM) ->addMargin(PHUI::MARGIN_MEDIUM)
->setShadow(true)); ->setBorder(true));
$head1 = id(new PHUIHeaderView()) $head1 = id(new PHUIHeaderView())
->setHeader(pht('Unstyled')); ->setHeader(pht('Unstyled'));

4
src/applications/uiexample/examples/PHUITextExample.php
View File

@@ -70,7 +70,7 @@ final class PHUITextExample extends PhabricatorUIExample {
$layout1 = id(new PHUIBoxView()) $layout1 = id(new PHUIBoxView())
->appendChild($content) ->appendChild($content)
->setShadow(true) ->setBorder(true)
->addPadding(PHUI::PADDING_MEDIUM); ->addPadding(PHUI::PADDING_MEDIUM);
$head1 = id(new PHUIHeaderView()) $head1 = id(new PHUIHeaderView())
@@ -82,7 +82,7 @@ final class PHUITextExample extends PhabricatorUIExample {
$layout2 = id(new PHUIBoxView()) $layout2 = id(new PHUIBoxView())
->appendChild($content2) ->appendChild($content2)
->setShadow(true) ->setBorder(true)
->addPadding(PHUI::PADDING_MEDIUM); ->addPadding(PHUI::PADDING_MEDIUM);
$head2 = id(new PHUIHeaderView()) $head2 = id(new PHUIHeaderView())

4
src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
View File

@@ -97,7 +97,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
->addColumn($friday) ->addColumn($friday)
->addColumn($saturday) ->addColumn($saturday)
->setFluidLayout(true) ->setFluidLayout(true)
->setShadow(true); ->setBorder(true);
$shipping = id(new PHUIFormLayoutView()) $shipping = id(new PHUIFormLayoutView())
->setUser($user) ->setUser($user)
@@ -160,7 +160,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
->addColumn(hsprintf('<h1>%s</h1>%s', $billing_title, $shipping)) ->addColumn(hsprintf('<h1>%s</h1>%s', $billing_title, $shipping))
->addColumn(hsprintf('<h1>%s</h1>%s', $cc_title, $cc)) ->addColumn(hsprintf('<h1>%s</h1>%s', $cc_title, $cc))
->setFluidLayout(true) ->setFluidLayout(true)
->setShadow(true); ->setBorder(true);
$wrap1 = phutil_tag( $wrap1 = phutil_tag(
'div', 'div',

4
src/applications/uiexample/examples/PhabricatorUIStatusExample.php
View File

@@ -48,7 +48,7 @@ final class PhabricatorUIStatusExample extends PhabricatorUIExample {
$out[] = id(new PHUIBoxView()) $out[] = id(new PHUIBoxView())
->addMargin(PHUI::MARGIN_LARGE) ->addMargin(PHUI::MARGIN_LARGE)
->addPadding(PHUI::PADDING_LARGE) ->addPadding(PHUI::PADDING_LARGE)
->setShadow(true) ->setBorder(true)
->appendChild($view); ->appendChild($view);
@@ -71,7 +71,7 @@ final class PhabricatorUIStatusExample extends PhabricatorUIExample {
$out[] = id(new PHUIBoxView()) $out[] = id(new PHUIBoxView())
->addMargin(PHUI::MARGIN_LARGE) ->addMargin(PHUI::MARGIN_LARGE)
->addPadding(PHUI::PADDING_LARGE) ->addPadding(PHUI::PADDING_LARGE)
->setShadow(true) ->setBorder(true)
->appendChild($view); ->appendChild($view);
return $out; return $out;

10
src/view/layout/AphrontMultiColumnView.php
View File

@@ -10,7 +10,7 @@ final class AphrontMultiColumnView extends AphrontView {
private $fluidLayout = false; private $fluidLayout = false;
private $fluidishLayout = false; private $fluidishLayout = false;
private $gutter; private $gutter;
private $shadow; private $border;
public function addColumn($column) { public function addColumn($column) {
$this->columns[] = $column; $this->columns[] = $column;
@@ -33,8 +33,8 @@ final class AphrontMultiColumnView extends AphrontView {
return $this; return $this;
} }
public function setShadow($shadow) { public function setBorder($border) {
$this->shadow = $shadow; $this->border = $border;
return $this; return $this;
} }
@@ -106,9 +106,9 @@ final class AphrontMultiColumnView extends AphrontView {
), ),
$view); $view);
if ($this->shadow) { if ($this->border) {
$board = id(new PHUIBoxView()) $board = id(new PHUIBoxView())
->setShadow(true) ->setBorder(true)
->appendChild($board) ->appendChild($board)
->addPadding(PHUI::PADDING_MEDIUM_TOP) ->addPadding(PHUI::PADDING_MEDIUM_TOP)
->addPadding(PHUI::PADDING_MEDIUM_BOTTOM); ->addPadding(PHUI::PADDING_MEDIUM_BOTTOM);

9
src/view/phui/PHUIBoxView.php
View File

@@ -4,7 +4,6 @@ final class PHUIBoxView extends AphrontTagView {
private $margin = array(); private $margin = array();
private $padding = array(); private $padding = array();
private $shadow = false;
private $border = false; private $border = false;
public function addMargin($margin) { public function addMargin($margin) {
@@ -17,11 +16,6 @@ final class PHUIBoxView extends AphrontTagView {
return $this; return $this;
} }
public function setShadow($shadow) {
$this->shadow = $shadow;
return $this;
}
public function setBorder($border) { public function setBorder($border) {
$this->border = $border; $this->border = $border;
return $this; return $this;
@@ -30,9 +24,6 @@ final class PHUIBoxView extends AphrontTagView {
protected function getTagAttributes() { protected function getTagAttributes() {
$outer_classes = array(); $outer_classes = array();
$outer_classes[] = 'phui-box'; $outer_classes[] = 'phui-box';
if ($this->shadow) {
$outer_classes[] = 'phui-box-shadow';
}
if ($this->border) { if ($this->border) {
$outer_classes[] = 'phui-box-border'; $outer_classes[] = 'phui-box-border';
} }

2
src/view/phui/PHUIFeedStoryView.php
View File

@@ -265,7 +265,7 @@ final class PHUIFeedStoryView extends AphrontView {
return id(new PHUIBoxView()) return id(new PHUIBoxView())
->addClass(implode(' ', $classes)) ->addClass(implode(' ', $classes))
->setShadow(true) ->setBorder(true)
->addMargin(PHUI::MARGIN_MEDIUM_BOTTOM) ->addMargin(PHUI::MARGIN_MEDIUM_BOTTOM)
->appendChild(array($head, $body, $foot)); ->appendChild(array($head, $body, $foot));
} }

14
webroot/rsrc/css/aphront/multi-column.css
View File

@@ -119,10 +119,10 @@
vertical-align: top; vertical-align: top;
} }
.phui-box-shadow .aphront-multi-column-column-outer { .phui-box-border .aphront-multi-column-column-outer {
border-right: 1px solid #e7e7e7; border-right: 1px solid {$lightblueborder};
padding-left: 10px; padding-left: 8px;
padding-right: 10px; padding-right: 8px;
} }
.phui-box-shadow .aphront-multi-colum-column-outer-last { .phui-box-shadow .aphront-multi-colum-column-outer-last {
@@ -134,12 +134,12 @@
border: none; border: none;
} }
.device .phui-box-shadow .aphront-multi-column-column-outer { .device .phui-box-border .aphront-multi-column-column-outer {
padding-bottom: 20px; padding-bottom: 16px;
border-bottom: 1px solid #e7e7e7; border-bottom: 1px solid #e7e7e7;
} }
.device .phui-box-shadow .aphront-multi-colum-column-outer-last { .device .phui-box-border .aphront-multi-colum-column-outer-last {
border: none; border: none;
padding-bottom: 0; padding-bottom: 0;
} }

11
webroot/rsrc/css/phui/phui-box.css
View File

@@ -2,17 +2,6 @@
* @provides phui-box-css * @provides phui-box-css
*/ */
.phui-box-shadow {
border-left: 1px solid #e7e7e7;
border-right: 1px solid #e7e7e7;
border-bottom: 1px solid #c0c5d1;
}
.phui-box-shadow .phui-box-inner {
background-color: #fff;
box-shadow: 0 1px 2px rgba(0,0,0,0.2);
}
.phui-box-border { .phui-box-border {
border: 1px solid {$lightblueborder}; border: 1px solid {$lightblueborder};
border-bottom: 1px solid {$blueborder}; border-bottom: 1px solid {$blueborder};