From 7c80257a57db5308a361feefb8cf6904b2d56a32 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 15 Nov 2016 11:20:55 -0800 Subject: [PATCH] Clean up Phame comment box CSS Summary: Fixes some outlying issues with new comment box and Phame Posts. Test Plan: Review CSS in sandbox, post new reply, see proper spacing. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16869 --- resources/celerity/map.php | 8 ++++---- webroot/rsrc/css/application/phame/phame.css | 11 ++++++++++- webroot/rsrc/css/phui/phui-document-pro.css | 4 ---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 46d3a51465..10d8bbc57a 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -84,7 +84,7 @@ return array( 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', 'rsrc/css/application/paste/paste.css' => '1898e534', 'rsrc/css/application/people/people-profile.css' => '2473d929', - 'rsrc/css/application/phame/phame.css' => '8efb0729', + 'rsrc/css/application/phame/phame.css' => '654dd9ef', 'rsrc/css/application/pholio/pholio-edit.css' => '07676f51', 'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49', 'rsrc/css/application/pholio/pholio.css' => 'ca89d380', @@ -135,7 +135,7 @@ return array( 'rsrc/css/phui/phui-comment-form.css' => '4ecc56ef', 'rsrc/css/phui/phui-crumbs-view.css' => '195ac419', 'rsrc/css/phui/phui-curtain-view.css' => '947bf1a4', - 'rsrc/css/phui/phui-document-pro.css' => 'd4559738', + 'rsrc/css/phui/phui-document-pro.css' => 'c354e312', 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', 'rsrc/css/phui/phui-document.css' => 'c32e8dec', 'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9', @@ -824,7 +824,7 @@ return array( 'phabricator-uiexample-reactor-sendclass' => '1def2711', 'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee', 'phabricator-zindex-css' => 'd1270942', - 'phame-css' => '8efb0729', + 'phame-css' => '654dd9ef', 'pholio-css' => 'ca89d380', 'pholio-edit-css' => '07676f51', 'pholio-inline-comments-css' => '8e545e49', @@ -851,7 +851,7 @@ return array( 'phui-curtain-view-css' => '947bf1a4', 'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-view-css' => 'c32e8dec', - 'phui-document-view-pro-css' => 'd4559738', + 'phui-document-view-pro-css' => 'c354e312', 'phui-feed-story-css' => '44a9c8e9', 'phui-font-icon-base-css' => '870a7360', 'phui-fontkit-css' => '9cda225e', diff --git a/webroot/rsrc/css/application/phame/phame.css b/webroot/rsrc/css/application/phame/phame.css index 75f1326af7..6a9a5b5717 100644 --- a/webroot/rsrc/css/application/phame/phame.css +++ b/webroot/rsrc/css/application/phame/phame.css @@ -309,6 +309,15 @@ padding-top: 8px; } -.phame-comment-view .aphront-form-control.aphront-form-control-select { +.phame-comment-view .phui-comment-form-view .phui-comment-action-bar { display: none; } + +.phame-comment-view .phui-comment-form-view .phui-comment-has-actions + .phui-comment-textarea-control { + padding-top: 16px; +} + +.phame-comment-view .phui-document-view-pro-box .phui-object-box { + margin-bottom: 16px; +} diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css index de6850a8ec..6cf0df1c68 100644 --- a/webroot/rsrc/css/phui/phui-document-pro.css +++ b/webroot/rsrc/css/phui/phui-document-pro.css @@ -198,10 +198,6 @@ a.button.phui-document-toc { border-top: 1px solid rgba({$alphablue}, 0.20); } -.phui-document-view-pro-box .phui-timeline-image { - border-radius: 25px; -} - .phui-document-view-pro-box .phui-timeline-wedge { display: none; }