From 95af3624d754bb1da2e61661e6eb74b1e4ada1d9 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 2 Feb 2016 14:45:50 -0800 Subject: [PATCH] Flip layout on PhameHome Summary: Centers the page for consistency for the rest of Phame, puts blog list on right for better mobile support. Test Plan: Review PhameHome at all breakpoints. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15170 --- resources/celerity/map.php | 10 ++--- .../phame/controller/PhameHomeController.php | 39 +++++-------------- .../application/base/standard-page-view.css | 6 +-- webroot/rsrc/css/application/phame/phame.css | 30 +++++++++----- 4 files changed, 37 insertions(+), 48 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 16da562d2a..cb5ab3509a 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '764d4c80', + 'core.pkg.css' => 'e33b14a4', 'core.pkg.js' => '53c6a7c5', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -36,7 +36,7 @@ return array( 'rsrc/css/application/base/notification-menu.css' => 'f31c0bde', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', 'rsrc/css/application/base/phui-theme.css' => 'ab7b848c', - 'rsrc/css/application/base/standard-page-view.css' => '7b0d68d8', + 'rsrc/css/application/base/standard-page-view.css' => 'c4467133', 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', 'rsrc/css/application/config/config-options.css' => '0ede4c9b', @@ -81,7 +81,7 @@ return array( 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', 'rsrc/css/application/paste/paste.css' => 'a5157c48', 'rsrc/css/application/people/people-profile.css' => '2473d929', - 'rsrc/css/application/phame/phame.css' => '6d5b3682', + 'rsrc/css/application/phame/phame.css' => '1dbbacf9', 'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee', 'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49', 'rsrc/css/application/pholio/pholio.css' => '95174bdd', @@ -765,7 +765,7 @@ return array( 'phabricator-side-menu-view-css' => '3a3d9f41', 'phabricator-slowvote-css' => 'da0afb1b', 'phabricator-source-code-view-css' => 'cbeef983', - 'phabricator-standard-page-view' => '7b0d68d8', + 'phabricator-standard-page-view' => 'c4467133', 'phabricator-textareautils' => '9e54692d', 'phabricator-title' => 'df5e11d2', 'phabricator-tooltip' => '6323f942', @@ -781,7 +781,7 @@ return array( 'phabricator-uiexample-reactor-sendclass' => '1def2711', 'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee', 'phabricator-zindex-css' => '5c7025bf', - 'phame-css' => '6d5b3682', + 'phame-css' => '1dbbacf9', 'pholio-css' => '95174bdd', 'pholio-edit-css' => '3ad9d1ee', 'pholio-inline-comments-css' => '8e545e49', diff --git a/src/applications/phame/controller/PhameHomeController.php b/src/applications/phame/controller/PhameHomeController.php index b9c7fc76d8..cea86735b5 100644 --- a/src/applications/phame/controller/PhameHomeController.php +++ b/src/applications/phame/controller/PhameHomeController.php @@ -55,20 +55,17 @@ final class PhameHomeController extends PhamePostController { ->addAction($create_button); } - $actions = $this->renderActions($viewer); - $action_button = id(new PHUIButtonView()) + $view_all = id(new PHUIButtonView()) ->setTag('a') - ->setText(pht('Actions')) - ->setHref('#') - ->setIcon('fa-bars') - ->addClass('phui-mobile-menu') - ->setDropdownMenu($actions); + ->setText(pht('View All')) + ->setHref($this->getApplicationURI('post/')) + ->setIcon('fa-list-ul'); $title = pht('Recent Posts'); $header = id(new PHUIHeaderView()) ->setHeader($title) - ->addActionLink($action_button); + ->addActionLink($view_all); $crumbs = $this->buildApplicationCrumbs(); $crumbs->setBorder(true); @@ -108,39 +105,21 @@ final class PhameHomeController extends PhamePostController { $blog_list, $draft_list, )) - ->setDisplay(PHUITwoColumnView::DISPLAY_LEFT) - ->addClass('phame-home-view'); + ->addClass('phame-home-container'); + + $phame_home = phutil_tag_div('phame-home-view', $phame_view); return $this->newPage() ->setTitle($title) ->setCrumbs($crumbs) ->appendChild( array( - $phame_view, + $phame_home, )); } - private function renderActions($viewer) { - $actions = id(new PhabricatorActionListView()) - ->setUser($viewer); - - $actions->addAction( - id(new PhabricatorActionView()) - ->setIcon('fa-pencil') - ->setHref($this->getApplicationURI('post/query/draft/')) - ->setName(pht('My Drafts'))); - - $actions->addAction( - id(new PhabricatorActionView()) - ->setIcon('fa-pencil-square-o') - ->setHref($this->getApplicationURI('post/')) - ->setName(pht('All Posts'))); - - return $actions; - } - private function renderBlogs($viewer, $blogs) {} protected function buildApplicationCrumbs() { diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index 830554db3e..ca69443d07 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -19,14 +19,14 @@ .phabricator-standard-page-footer { text-align: right; - margin: 32px 16px 16px; + margin: 44px 16px 16px; padding: 12px 0; - border-top: 1px solid rgba(71, 87, 120, 0.20); + border-top: 1px solid rgba(55,55,55,.1); color: {$greytext}; } .device .phabricator-standard-page-footer { - margin: 4px 8px; + margin: 24px 8px 16px; } !print .phabricator-standard-page-footer { diff --git a/webroot/rsrc/css/application/phame/phame.css b/webroot/rsrc/css/application/phame/phame.css index be161c1ede..3d151426d6 100644 --- a/webroot/rsrc/css/application/phame/phame.css +++ b/webroot/rsrc/css/application/phame/phame.css @@ -43,24 +43,34 @@ background-color: #fff; } -.device .phame-home-view .phui-side-column { - background-color: transparent; +.phame-home-view { + background-color: #fff; + border-bottom: 1px solid rgba(55,55,55,.1); +} + +.phame-home-view .phame-home-container { + max-width: 980px; + margin: 0 auto; +} + +.phame-home-view .phui-document-container { + border: none; } .phame-blog-list { - margin: 24px 16px 16px 16px; + margin: 96px 16px 16px 16px; +} + +.phame-blog-list + .phame-blog-list { + margin-top: 24px; } .device .phame-blog-list { - padding: 0; - background-color: {$bluebackground}; - margin: 0; - border-radius: 0; - border-bottom: 1px solid {$thinblueborder}; + margin: 16px; } -.phame-blog-list-item:last-child { - margin-bottom: 0; +.device-phone .phame-blog-list { + margin: 16px 8px; } .phame-blog-list-header {