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' => 'ed7ae7bb', + 'core.pkg.css' => '25e4069a', 'core.pkg.js' => 'b562c3db', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '3fb7f532', @@ -70,7 +70,6 @@ 'rsrc/css/application/feed/feed.css' => 'ecd4ec57', 'rsrc/css/application/files/global-drag-and-drop.css' => '5c1b47c2', 'rsrc/css/application/flag/flag.css' => '5337623f', - 'rsrc/css/application/guides/guides.css' => '1d5414e5', 'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4', 'rsrc/css/application/herald/herald-test.css' => 'a52e323e', 'rsrc/css/application/herald/herald.css' => 'dc31f6e9', @@ -148,7 +147,7 @@ 'rsrc/css/phui/phui-info-view.css' => '28efab79', 'rsrc/css/phui/phui-list.css' => '9da2aa00', 'rsrc/css/phui/phui-object-box.css' => '6b487c57', - 'rsrc/css/phui/phui-object-item-list-view.css' => '40010767', + 'rsrc/css/phui/phui-object-item-list-view.css' => '985e9d54', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-profile-menu.css' => '8a3fc181', @@ -574,7 +573,6 @@ 'font-fontawesome' => '2b7ebbcc', 'font-lato' => 'c7ccd872', 'global-drag-and-drop-css' => '5c1b47c2', - 'guides-app-css' => '1d5414e5', 'harbormaster-css' => 'f491c9f4', 'herald-css' => 'dc31f6e9', 'herald-rule-editor' => 'd6a7e717', @@ -858,7 +856,7 @@ 'phui-inline-comment-view-css' => '5953c28e', 'phui-list-view-css' => '9da2aa00', 'phui-object-box-css' => '6b487c57', - 'phui-object-item-list-view-css' => '40010767', + 'phui-object-item-list-view-css' => '985e9d54', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', 'phui-profile-menu-css' => '8a3fc181', diff --git a/src/applications/guides/controller/PhabricatorGuideInstallController.php b/src/applications/guides/controller/PhabricatorGuideInstallController.php --- a/src/applications/guides/controller/PhabricatorGuideInstallController.php +++ b/src/applications/guides/controller/PhabricatorGuideInstallController.php @@ -8,7 +8,6 @@ } public function handleRequest(AphrontRequest $request) { - require_celerity_resource('guides-app-css'); $viewer = $request->getViewer(); $title = pht('Installation Guide'); diff --git a/src/applications/guides/controller/PhabricatorGuideQuickStartController.php b/src/applications/guides/controller/PhabricatorGuideQuickStartController.php --- a/src/applications/guides/controller/PhabricatorGuideQuickStartController.php +++ b/src/applications/guides/controller/PhabricatorGuideQuickStartController.php @@ -8,7 +8,6 @@ } public function handleRequest(AphrontRequest $request) { - require_celerity_resource('guides-app-css'); $viewer = $request->getViewer(); $title = pht('Quick Start Guide'); diff --git a/src/applications/guides/controller/PhabricatorGuideWelcomeController.php b/src/applications/guides/controller/PhabricatorGuideWelcomeController.php --- a/src/applications/guides/controller/PhabricatorGuideWelcomeController.php +++ b/src/applications/guides/controller/PhabricatorGuideWelcomeController.php @@ -8,7 +8,6 @@ } public function handleRequest(AphrontRequest $request) { - require_celerity_resource('guides-app-css'); $viewer = $request->getViewer(); $title = pht('Welcome to Phabricator'); diff --git a/src/applications/guides/view/PhabricatorGuideListView.php b/src/applications/guides/view/PhabricatorGuideListView.php --- a/src/applications/guides/view/PhabricatorGuideListView.php +++ b/src/applications/guides/view/PhabricatorGuideListView.php @@ -10,10 +10,8 @@ } public function render() { - require_celerity_resource('guides-app-css'); - $list = id(new PHUIObjectItemListView()) - ->addClass('guides-app'); + ->setBig(true); foreach ($this->items as $item) { $icon = id(new PHUIIconView()) diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php --- a/src/view/phui/PHUIObjectItemListView.php +++ b/src/view/phui/PHUIObjectItemListView.php @@ -8,6 +8,7 @@ private $noDataString; private $flush; private $simple; + private $big; private $allowEmptyList; private $itemClass = 'phui-object-item-standard'; @@ -40,6 +41,11 @@ return $this; } + public function setBig($big) { + $this->big = $big; + return $this; + } + public function setNoDataString($no_data_string) { $this->noDataString = $no_data_string; return $this; @@ -69,6 +75,9 @@ if ($this->simple) { $classes[] = 'phui-object-list-simple'; } + if ($this->big) { + $classes[] = 'phui-object-list-big'; + } return array( 'class' => $classes, diff --git a/webroot/rsrc/css/application/guides/guides.css b/webroot/rsrc/css/application/guides/guides.css deleted file mode 100644 --- a/webroot/rsrc/css/application/guides/guides.css +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @provides guides-app-css - */ - -.guides-app ul.phui-object-item-list-view { - margin: 0; - padding: 20px; -} - -.guides-app .phui-object-item-no-bar .phui-object-item-frame { - border: 0; -} - -.guides-app .phui-object-item-image-icon { - margin: 8px 2px 12px; -} - -.guides-app a.phui-object-item-link { - color: #000; - font-size: {$biggestfontsize}; -} - -.guides-app .phui-object-item-name { - padding-top: 6px; -} - -.guides-app .phui-object-item-launch-button a.button { - font-size: {$normalfontsize}; - padding: 3px 12px 4px; -} - -.device-desktop .guides-app .phui-object-item { - margin-bottom: 8px; -} diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -738,3 +738,36 @@ bottom: 2px; right: 2px; } + +/* - Big List---------------------------------------------------------------- */ + +.phui-object-list-big ul.phui-object-item-list-view { + margin: 0; + padding: 20px; +} + +.phui-object-list-big .phui-object-item-no-bar .phui-object-item-frame { + border: 0; +} + +.phui-object-list-big .phui-object-item-image-icon { + margin: 8px 2px 12px; +} + +.phui-object-list-big a.phui-object-item-link { + color: #000; + font-size: {$biggestfontsize}; +} + +.phui-object-list-big .phui-object-item-name { + padding-top: 6px; +} + +.phui-object-list-big .phui-object-item-launch-button a.button { + font-size: {$normalfontsize}; + padding: 3px 12px 4px; +} + +.device-desktop .phui-object-list-big .phui-object-item { + margin-bottom: 8px; +}