diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -28,7 +28,6 @@ 'rsrc/css/aphront/table-view.css' => 'e3632cc9', 'rsrc/css/aphront/tokenizer.css' => '04875312', 'rsrc/css/aphront/tooltip.css' => '7672b60f', - 'rsrc/css/aphront/two-column.css' => '16ab3ad2', 'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c', 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', @@ -500,7 +499,6 @@ 'aphront-table-view-css' => 'e3632cc9', 'aphront-tokenizer-control-css' => '04875312', 'aphront-tooltip-css' => '7672b60f', - 'aphront-two-column-view-css' => '16ab3ad2', 'aphront-typeahead-control-css' => '0e403212', 'auth-css' => '0877ed6e', 'bulk-job-css' => 'df9c1d4a', 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 @@ -165,7 +165,6 @@ 'AphrontTableView' => 'view/control/AphrontTableView.php', 'AphrontTagView' => 'view/AphrontTagView.php', 'AphrontTokenizerTemplateView' => 'view/control/AphrontTokenizerTemplateView.php', - 'AphrontTwoColumnView' => 'view/layout/AphrontTwoColumnView.php', 'AphrontTypeaheadTemplateView' => 'view/control/AphrontTypeaheadTemplateView.php', 'AphrontURIMapper' => 'aphront/AphrontURIMapper.php', 'AphrontUnhandledExceptionResponse' => 'aphront/response/AphrontUnhandledExceptionResponse.php', @@ -2979,7 +2978,6 @@ 'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php', 'PhabricatorTwitchAuthProvider' => 'applications/auth/provider/PhabricatorTwitchAuthProvider.php', 'PhabricatorTwitterAuthProvider' => 'applications/auth/provider/PhabricatorTwitterAuthProvider.php', - 'PhabricatorTwoColumnUIExample' => 'applications/uiexample/examples/PhabricatorTwoColumnUIExample.php', 'PhabricatorTypeaheadApplication' => 'applications/typeahead/application/PhabricatorTypeaheadApplication.php', 'PhabricatorTypeaheadCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php', 'PhabricatorTypeaheadDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php', @@ -3760,7 +3758,6 @@ 'AphrontTableView' => 'AphrontView', 'AphrontTagView' => 'AphrontView', 'AphrontTokenizerTemplateView' => 'AphrontView', - 'AphrontTwoColumnView' => 'AphrontView', 'AphrontTypeaheadTemplateView' => 'AphrontView', 'AphrontURIMapper' => 'Phobject', 'AphrontUnhandledExceptionResponse' => 'AphrontStandaloneHTMLResponse', @@ -7034,7 +7031,6 @@ 'PhabricatorTrivialTestCase' => 'PhabricatorTestCase', 'PhabricatorTwitchAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorTwitterAuthProvider' => 'PhabricatorOAuth1AuthProvider', - 'PhabricatorTwoColumnUIExample' => 'PhabricatorUIExample', 'PhabricatorTypeaheadApplication' => 'PhabricatorApplication', 'PhabricatorTypeaheadCompositeDatasource' => 'PhabricatorTypeaheadDatasource', 'PhabricatorTypeaheadDatasource' => 'Phobject', diff --git a/src/applications/uiexample/examples/PhabricatorTwoColumnUIExample.php b/src/applications/uiexample/examples/PhabricatorTwoColumnUIExample.php deleted file mode 100644 --- a/src/applications/uiexample/examples/PhabricatorTwoColumnUIExample.php +++ /dev/null @@ -1,36 +0,0 @@ - 'border: 1px solid blue; padding: 20px;', - ), - 'Mary, mary quite contrary.'); - - $side = phutil_tag( - 'div', - array( - 'style' => 'border: 1px solid red; padding: 20px;', - ), - 'How does your garden grow?'); - - - $content = id(new AphrontTwoColumnView()) - ->setMainColumn($main) - ->setSideColumn($side); - - return $content; - } -} diff --git a/src/view/layout/AphrontTwoColumnView.php b/src/view/layout/AphrontTwoColumnView.php deleted file mode 100644 --- a/src/view/layout/AphrontTwoColumnView.php +++ /dev/null @@ -1,66 +0,0 @@ -mainColumn = $main; - return $this; - } - - public function setSideColumn($side) { - $this->sideColumn = $side; - return $this; - } - - public function setCentered($centered) { - $this->centered = $centered; - return $this; - } - - public function setNoPadding($padding) { - $this->padding = $padding; - return $this; - } - - public function render() { - require_celerity_resource('aphront-two-column-view-css'); - - $main = phutil_tag( - 'div', - array( - 'class' => 'aphront-main-column', - ), - $this->mainColumn); - - $side = phutil_tag( - 'div', - array( - 'class' => 'aphront-side-column', - ), - $this->sideColumn); - - $classes = array('aphront-two-column'); - if ($this->centered) { - $classes = array('aphront-two-column-centered'); - } - - if ($this->padding) { - $classes[] = 'aphront-two-column-padded'; - } - - return phutil_tag( - 'div', - array( - 'class' => implode(' ', $classes), - ), - array( - $main, - $side, - )); - } -} diff --git a/webroot/rsrc/css/aphront/two-column.css b/webroot/rsrc/css/aphront/two-column.css deleted file mode 100644 --- a/webroot/rsrc/css/aphront/two-column.css +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @provides aphront-two-column-view-css - */ - -.aphront-two-column { - position: relative; -} - -.device-desktop .aphront-two-column.aphront-two-column-padded { - margin: 20px; -} - -.device-desktop .aphront-two-column .aphront-main-column { - margin-right: 300px; -} - -.device-desktop .aphront-two-column .aphront-side-column { - width: 300px; - position: absolute; - top: 0; - right: 0; -} - -.device-desktop .aphront-two-column-centered { - width: 980px; - margin: 0 auto; -} - -.device-desktop .aphront-two-column-centered .aphront-main-column { - float: left; - width: 820px; -} - -.device-desktop .aphront-two-column-centered .aphront-side-column { - width: 160px; - float: right; -} - -.device-phone .aphront-two-column.aphront-two-column-padded { - margin: 10px; -}