1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-01 19:22:42 +01:00

Fix comment box borders in timelines after Phriction commenting

Summary:
Ref T13202. In D19660, I added comments to Phriction and tweaked some CSS.

One of these tweaks was getting rid of an extra border which was rendering under the comment area. However, I took off too much and ended up removing borders from other applications.

I think we don't actually need this `setNoBorder()` stuff after all -- a later change was sufficient to stop the actual border I was trying to get rid of from rendering. So this mostly just reverts part of D19660.

This rendering still isn't perfect, but I'm fine leaving that for another day for now.

Test Plan:
  - Viewed comment areas in Phriction. Saw correct number of borders (1).
  - Viewed comment areas in Maniphest. Saw correct number of borders (1).
  - Grepped for extraneous removed classs, no hits.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19684
This commit is contained in:
epriestley 2018-09-18 07:46:40 -07:00
parent 5ba66e56fd
commit 3244324cb1
3 changed files with 4 additions and 12 deletions

View file

@ -23,6 +23,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
private $fullWidth; private $fullWidth;
private $infoView; private $infoView;
private $editEngineLock; private $editEngineLock;
private $noBorder;
private $currentVersion; private $currentVersion;
private $versionedDraft; private $versionedDraft;
@ -243,7 +244,6 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
$comment_box = id(new PHUIObjectBoxView()) $comment_box = id(new PHUIObjectBoxView())
->setFlush(true) ->setFlush(true)
->setNoBorder(true)
->addClass('phui-comment-form-view') ->addClass('phui-comment-form-view')
->addSigil('phui-comment-form') ->addSigil('phui-comment-form')
->appendChild( ->appendChild(

View file

@ -25,7 +25,6 @@ final class PHUIObjectBoxView extends AphrontTagView {
private $showHideHref; private $showHideHref;
private $showHideContent; private $showHideContent;
private $showHideOpen; private $showHideOpen;
private $noBorder;
private $propertyLists = array(); private $propertyLists = array();
@ -148,11 +147,6 @@ final class PHUIObjectBoxView extends AphrontTagView {
return $this; return $this;
} }
public function setNoBorder($no_border) {
$this->noBorder = $no_border;
return $this;
}
public function setValidationException( public function setValidationException(
PhabricatorApplicationTransactionValidationException $ex = null) { PhabricatorApplicationTransactionValidationException $ex = null) {
$this->validationException = $ex; $this->validationException = $ex;
@ -162,9 +156,7 @@ final class PHUIObjectBoxView extends AphrontTagView {
protected function getTagAttributes() { protected function getTagAttributes() {
$classes = array(); $classes = array();
$classes[] = 'phui-box'; $classes[] = 'phui-box';
if (!$this->noBorder) {
$classes[] = 'phui-box-border'; $classes[] = 'phui-box-border';
}
$classes[] = 'phui-object-box'; $classes[] = 'phui-object-box';
$classes[] = 'mlt mll mlr'; $classes[] = 'mlt mll mlr';

View file

@ -402,7 +402,7 @@ final class PHUITimelineEventView extends AphrontView {
$wedge = phutil_tag( $wedge = phutil_tag(
'div', 'div',
array( array(
'class' => 'phui-timeline-wedge phui-timeline-border', 'class' => 'phui-timeline-wedge',
'style' => (nonempty($image_uri)) ? '' : 'display: none;', 'style' => (nonempty($image_uri)) ? '' : 'display: none;',
), ),
''); '');
@ -461,7 +461,7 @@ final class PHUITimelineEventView extends AphrontView {
$content = phutil_tag( $content = phutil_tag(
'div', 'div',
array( array(
'class' => 'phui-timeline-group phui-timeline-border', 'class' => 'phui-timeline-group',
), ),
$content); $content);