Page MenuHomePhabricator

D12004.diff
No OneTemporary

D12004.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'a9770fbb',
+ 'core.pkg.css' => '6408f2d3',
'core.pkg.js' => '5a1c336d',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '6641cdd5',
@@ -24,7 +24,7 @@
'rsrc/css/aphront/multi-column.css' => '41a848c0',
'rsrc/css/aphront/notification.css' => '9c279160',
'rsrc/css/aphront/pager-view.css' => '2e3539af',
- 'rsrc/css/aphront/panel-view.css' => '7e0c3a56',
+ 'rsrc/css/aphront/panel-view.css' => '8427b78d',
'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435',
'rsrc/css/aphront/table-view.css' => 'b22b7216',
'rsrc/css/aphront/tokenizer.css' => '82ce2142',
@@ -72,7 +72,7 @@
'rsrc/css/application/herald/herald.css' => '826075fa',
'rsrc/css/application/home/home.css' => 'e34bf140',
'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc',
- 'rsrc/css/application/maniphest/report.css' => 'd8ed71ad',
+ 'rsrc/css/application/maniphest/report.css' => 'f6931fdf',
'rsrc/css/application/maniphest/task-edit.css' => '8e23031b',
'rsrc/css/application/maniphest/task-summary.css' => 'ab2fc691',
'rsrc/css/application/objectselector/object-selector.css' => '029a133d',
@@ -129,13 +129,13 @@
'rsrc/css/phui/phui-document.css' => '0f83a7df',
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
'rsrc/css/phui/phui-fontkit.css' => 'd30f4fa3',
- 'rsrc/css/phui/phui-form-view.css' => '76f0b086',
+ 'rsrc/css/phui/phui-form-view.css' => '78d729fe',
'rsrc/css/phui/phui-form.css' => 'f535f938',
'rsrc/css/phui/phui-header-view.css' => '083669db',
'rsrc/css/phui/phui-icon.css' => 'd35aa857',
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
- 'rsrc/css/phui/phui-info-view.css' => '6c6cc4dd',
+ 'rsrc/css/phui/phui-info-view.css' => 'c6f0aef8',
'rsrc/css/phui/phui-list.css' => '53deb25c',
'rsrc/css/phui/phui-object-box.css' => 'd68ce5dc',
'rsrc/css/phui/phui-object-item-list-view.css' => '9db65899',
@@ -502,7 +502,7 @@
'aphront-list-filter-view-css' => '2ae43867',
'aphront-multi-column-view-css' => '41a848c0',
'aphront-pager-view-css' => '2e3539af',
- 'aphront-panel-view-css' => '7e0c3a56',
+ 'aphront-panel-view-css' => '8427b78d',
'aphront-table-view-css' => 'b22b7216',
'aphront-tokenizer-control-css' => '82ce2142',
'aphront-tooltip-css' => '4099b97e',
@@ -698,7 +698,7 @@
'javelin-workflow' => '84d6aea0',
'lightbox-attachment-css' => '7acac05d',
'maniphest-batch-editor' => '8f380ebc',
- 'maniphest-report-css' => 'd8ed71ad',
+ 'maniphest-report-css' => 'f6931fdf',
'maniphest-task-edit-css' => '8e23031b',
'maniphest-task-summary-css' => 'ab2fc691',
'multirow-row-manager' => 'b5d57730',
@@ -781,12 +781,12 @@
'phui-font-icon-base-css' => '3dad2ae3',
'phui-fontkit-css' => 'd30f4fa3',
'phui-form-css' => 'f535f938',
- 'phui-form-view-css' => '76f0b086',
+ 'phui-form-view-css' => '78d729fe',
'phui-header-view-css' => '083669db',
'phui-icon-view-css' => 'd35aa857',
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
- 'phui-info-view-css' => '6c6cc4dd',
+ 'phui-info-view-css' => 'c6f0aef8',
'phui-list-view-css' => '53deb25c',
'phui-object-box-css' => 'd68ce5dc',
'phui-object-item-list-view-css' => '9db65899',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -151,7 +151,6 @@
'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php',
'AphrontPageView' => 'view/page/AphrontPageView.php',
'AphrontPagerView' => 'view/control/AphrontPagerView.php',
- 'AphrontPanelView' => 'view/layout/AphrontPanelView.php',
'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php',
'AphrontProgressBarView' => 'view/widget/bars/AphrontProgressBarView.php',
'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php',
@@ -3307,7 +3306,6 @@
'AphrontPHPHTTPSink' => 'AphrontHTTPSink',
'AphrontPageView' => 'AphrontView',
'AphrontPagerView' => 'AphrontView',
- 'AphrontPanelView' => 'AphrontView',
'AphrontPlainTextResponse' => 'AphrontResponse',
'AphrontProgressBarView' => 'AphrontBarView',
'AphrontProxyResponse' => 'AphrontResponse',
diff --git a/src/view/layout/AphrontPanelView.php b/src/view/layout/AphrontPanelView.php
deleted file mode 100644
--- a/src/view/layout/AphrontPanelView.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-final class AphrontPanelView extends AphrontView {
-
- const WIDTH_FULL = 'full';
- const WIDTH_FORM = 'form';
- const WIDTH_WIDE = 'wide';
-
- private $buttons = array();
- private $header;
- private $caption;
- private $width;
- private $classes = array();
- private $id;
-
- public function setCreateButton($create_button, $href) {
- $this->addButton(
- phutil_tag(
- 'a',
- array(
- 'href' => $href,
- 'class' => 'button green',
- ),
- $create_button));
-
- return $this;
- }
-
- public function addClass($class) {
- $this->classes[] = $class;
- return $this;
- }
-
- public function addButton($button) {
- $this->buttons[] = $button;
- return $this;
- }
-
- public function setHeader($header) {
- $this->header = $header;
- return $this;
- }
-
- public function setWidth($width) {
- $this->width = $width;
- return $this;
- }
-
- public function setID($id) {
- $this->id = $id;
- return $this;
- }
-
- public function setCaption($caption) {
- $this->caption = $caption;
- return $this;
- }
-
- public function setNoBackground() {
- $this->classes[] = 'aphront-panel-plain';
- return $this;
- }
-
- public function render() {
- if ($this->header !== null) {
- $header = phutil_tag('h1', array(), $this->header);
- } else {
- $header = null;
- }
-
- if ($this->caption !== null) {
- $caption = phutil_tag_div('aphront-panel-view-caption', $this->caption);
- } else {
- $caption = null;
- }
-
- $buttons = null;
- if ($this->buttons) {
- $buttons = phutil_tag_div(
- 'aphront-panel-view-buttons',
- phutil_implode_html(' ', $this->buttons));
- }
- $header_elements = phutil_tag_div(
- 'aphront-panel-header',
- array($buttons, $header, $caption));
-
- $table = phutil_implode_html('', $this->renderChildren());
-
- require_celerity_resource('aphront-panel-view-css');
-
- $classes = $this->classes;
- $classes[] = 'aphront-panel-view';
- if ($this->width) {
- $classes[] = 'aphront-panel-width-'.$this->width;
- }
-
- return phutil_tag(
- 'div',
- array(
- 'class' => implode(' ', $classes),
- 'id' => $this->id,
- ),
- array($header_elements, $table));
- }
-
-}
diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css
--- a/webroot/rsrc/css/aphront/panel-view.css
+++ b/webroot/rsrc/css/aphront/panel-view.css
@@ -2,89 +2,6 @@
* @provides aphront-panel-view-css
*/
-
-.aphront-panel-view {
- background: {$lightgreybackground};
- border: 1px solid #c0c0c0;
- border-width: 1px 0 0;
- padding: 8px 16px;
- margin: 20px 16px 32px 16px;
-}
-
-.device-phone .aphront-panel-view {
- margin: 20px 8px 40px 8px;
-}
-
-.aphront-unpadded-panel-view {
- padding: 0;
-}
-
-.aphront-panel-view.aphront-panel-plain {
- padding: 0;
- border: none;
- background: transparent;
-}
-
-.aphront-panel-view .aphront-panel-header {
- margin: 0 0 8px 0;
-}
-
-.aphront-panel-view h1 {
- font-size: 16px;
- font-weight: bold;
- color: {$darkbluetext};
- text-shadow: 0 1px 1px #fff;
- padding: 4px 0 0 0;
-}
-
-.aphront-panel-view h1 a {
- color: {$darkbluetext};
- text-decoration: none;
-}
-
-.aphront-panel-view h1 a:hover {
- text-decoration: underline;
-}
-
-.aphront-panel-plain h1 {
- padding: 0;
-}
-
-.aphront-panel-view-caption {
- font-size: 11px;
- color: {$greytext};
- margin-top: 4px;
- margin-bottom: 4px;
-}
-
-.aphront-panel-view-buttons {
- float: right;
-}
-
-.device-desktop .aphront-panel-width-form {
- width: 720px;
- margin-right: auto;
- margin-left: auto;
-}
-
-.device-desktop .aphront-panel-width-wide {
- width: 1080px;
- margin-right: auto;
- margin-left: auto;
-}
-
-.aphront-panel-accent {
- background: #f1f1f1;
- border: 1px solid #ddd;
- border-radius: 3px;
-}
-
-.aphront-panel-accent .phui-form-view {
- background: {$lightgreybackground};
- border: 1px solid #c4c4c0;
- border-radius: 3px;
-}
-
.aphront-panel-preview {
padding: 16px;
}
@@ -93,14 +10,6 @@
display: none;
}
-.aphront-panel-preview-wide {
- width: 1080px;
- margin-left: auto;
- margin-right: auto;
- padding-left: 2em;
- padding-right: 2em;
-}
-
.aphront-panel-preview-loading-text {
color: {$greytext};
}
@@ -108,13 +17,3 @@
.aphront-panel-flush {
margin: 0;
}
-
-.aphront-panel-view-drag-and-drop {
- background: #99ff99;
- border-color: #669966;
-}
-
-.aphront-panel-view-drag-and-drop .phui-form-view {
- background: #ccffcc;
- border-color: #669966;
-}
diff --git a/webroot/rsrc/css/application/maniphest/report.css b/webroot/rsrc/css/application/maniphest/report.css
--- a/webroot/rsrc/css/application/maniphest/report.css
+++ b/webroot/rsrc/css/application/maniphest/report.css
@@ -23,7 +23,3 @@
color: {$green};
font-weight: bold;
}
-
-.aphront-panel-view-caption p {
- padding: 6px 0 0;
-}
diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
--- a/webroot/rsrc/css/phui/phui-form-view.css
+++ b/webroot/rsrc/css/phui/phui-form-view.css
@@ -171,11 +171,6 @@
margin: 0;
}
-/* override for when inside an aphront-panel-view */
-.aphront-panel-view .phui-form-view h1 {
- padding: 0em 0em .8em 0em;
-}
-
.aphront-form-instructions {
width: 60%;
margin-left: 20%;
diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css
--- a/webroot/rsrc/css/phui/phui-info-view.css
+++ b/webroot/rsrc/css/phui/phui-info-view.css
@@ -38,11 +38,6 @@
padding-top: 4px;
}
-.aphront-panel-plain .phui-info-view {
- margin-left: 0;
- margin-right: 0;
-}
-
h1.phui-info-view-head {
font-weight: bold;
font-size: 15px;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 11, 8:03 AM (1 d, 18 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6716673
Default Alt Text
D12004.diff (10 KB)

Event Timeline