1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-28 00:10:57 +01:00

Remove phui-box-inner

Summary: When we removed the shadow, we no longer needed two containers.

Test Plan: Browsed Box example, a diff, a task, and other random pages. Grep for phui-box-inner, not used elsewhere.

Reviewers: epriestley

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D8281
This commit is contained in:
Chad Little 2014-02-19 23:05:42 -08:00
parent c904e04f89
commit 65a3aa0cc7
3 changed files with 7 additions and 20 deletions

View file

@ -123,7 +123,7 @@ return array(
'rsrc/css/layout/phabricator-hovercard-view.css' => '67c12b16', 'rsrc/css/layout/phabricator-hovercard-view.css' => '67c12b16',
'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/phui/phui-box.css' => '6c21bd6a', 'rsrc/css/phui/phui-box.css' => '1a82a4ae',
'rsrc/css/phui/phui-button.css' => '8784a966', 'rsrc/css/phui/phui-button.css' => '8784a966',
'rsrc/css/phui/phui-calendar-month.css' => '3474d15a', 'rsrc/css/phui/phui-calendar-month.css' => '3474d15a',
'rsrc/css/phui/phui-document.css' => '143b2ac8', 'rsrc/css/phui/phui-document.css' => '143b2ac8',
@ -735,7 +735,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' => '6c21bd6a', 'phui-box-css' => '1a82a4ae',
'phui-button-css' => '8784a966', 'phui-button-css' => '8784a966',
'phui-calendar-month-css' => '3474d15a', 'phui-calendar-month-css' => '3474d15a',
'phui-document-view-css' => '143b2ac8', 'phui-document-view-css' => '143b2ac8',

View file

@ -22,6 +22,7 @@ final class PHUIBoxView extends AphrontTagView {
} }
protected function getTagAttributes() { protected function getTagAttributes() {
require_celerity_resource('phui-box-css');
$outer_classes = array(); $outer_classes = array();
$outer_classes[] = 'phui-box'; $outer_classes[] = 'phui-box';
if ($this->border) { if ($this->border) {
@ -30,7 +31,9 @@ final class PHUIBoxView extends AphrontTagView {
foreach ($this->margin as $margin) { foreach ($this->margin as $margin) {
$outer_classes[] = $margin; $outer_classes[] = $margin;
} }
foreach ($this->padding as $padding) {
$outer_classes[] = $padding;
}
return array('class' => $outer_classes); return array('class' => $outer_classes);
} }
@ -39,19 +42,6 @@ final class PHUIBoxView extends AphrontTagView {
} }
public function getTagContent() { public function getTagContent() {
require_celerity_resource('phui-box-css'); return $this->renderChildren();
$inner_classes = array();
$inner_classes[] = 'phui-box-inner';
foreach ($this->padding as $padding) {
$inner_classes[] = $padding;
}
return phutil_tag(
'div',
array(
'class' => implode(' ', $inner_classes)
),
$this->renderChildren());
} }
} }

View file

@ -5,9 +5,6 @@
.phui-box-border { .phui-box-border {
border: 1px solid {$lightblueborder}; border: 1px solid {$lightblueborder};
border-bottom: 1px solid {$blueborder}; border-bottom: 1px solid {$blueborder};
}
.phui-box-border .phui-box-inner {
background-color: #fff; background-color: #fff;
} }