Page MenuHomePhabricator
Files F13981125

D8281.id.diff
No OneTemporary
Actions

D8281.id.diff
View Options

Index: resources/celerity/map.php
===================================================================
--- resources/celerity/map.php
+++ resources/celerity/map.php
@@ -123,7 +123,7 @@
'rsrc/css/layout/phabricator-hovercard-view.css' => '67c12b16',
'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0',
'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-calendar-month.css' => '3474d15a',
'rsrc/css/phui/phui-document.css' => '143b2ac8',
@@ -735,7 +735,7 @@
'phortune-credit-card-form-css' => 'b25b4beb',
'phrequent-css' => 'ffc185ad',
'phriction-document-css' => 'b0309d8e',
- 'phui-box-css' => '6c21bd6a',
+ 'phui-box-css' => '1a82a4ae',
'phui-button-css' => '8784a966',
'phui-calendar-month-css' => '3474d15a',
'phui-document-view-css' => '143b2ac8',
Index: src/view/phui/PHUIBoxView.php
===================================================================
--- src/view/phui/PHUIBoxView.php
+++ src/view/phui/PHUIBoxView.php
@@ -22,6 +22,7 @@
}
protected function getTagAttributes() {
+ require_celerity_resource('phui-box-css');
$outer_classes = array();
$outer_classes[] = 'phui-box';
if ($this->border) {
@@ -30,7 +31,9 @@
foreach ($this->margin as $margin) {
$outer_classes[] = $margin;
}
-
+ foreach ($this->padding as $padding) {
+ $outer_classes[] = $padding;
+ }
return array('class' => $outer_classes);
}
@@ -39,19 +42,6 @@
}
public function getTagContent() {
- require_celerity_resource('phui-box-css');
-
- $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());
+ return $this->renderChildren();
}
}
Index: webroot/rsrc/css/phui/phui-box.css
===================================================================
--- webroot/rsrc/css/phui/phui-box.css
+++ webroot/rsrc/css/phui/phui-box.css
@@ -5,9 +5,6 @@
.phui-box-border {
border: 1px solid {$lightblueborder};
border-bottom: 1px solid {$blueborder};
-}
-
-.phui-box-border .phui-box-inner {
background-color: #fff;
}

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 20, 2:26 PM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6736684
Default Alt Text
D8281.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility