diff --git a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php index 2ff055bc60..b293ef07f2 100644 --- a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php +++ b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php @@ -1,176 +1,178 @@ inlineComment = $comment; return $this; } public function setOnRight($on_right) { $this->onRight = $on_right; return $this; } public function setBuildScaffolding($scaffold) { $this->buildScaffolding = $scaffold; return $this; } public function setHandles(array $handles) { $this->handles = $handles; return $this; } public function setMarkupEngine(PhutilMarkupEngine $engine) { $this->markupEngine = $engine; return $this; } public function setEditable($editable) { $this->editable = $editable; return $this; } public function render() { $inline = $this->inlineComment; $start = $inline->getLineNumber(); $length = $inline->getLineLength(); if ($length) { $end = $start + $length; $line = 'Lines '.number_format($start).'-'.number_format($end); } else { $line = 'Line '.number_format($start); } $metadata = array( 'id' => $inline->getID(), 'number' => $inline->getLineNumber(), 'length' => $inline->getLineLength(), 'on_right' => $this->onRight, ); $sigil = 'differential-inline-comment'; $content = $inline->getContent(); $handles = $this->handles; $links = array(); if ($this->editable) { $links[] = javelin_render_tag( 'a', array( 'href' => '#', 'mustcapture' => true, 'sigil' => 'differential-inline-edit', ), 'Edit'); $links[] = javelin_render_tag( 'a', array( 'href' => '#', 'mustcapture' => true, 'sigil' => 'differential-inline-delete', ), 'Delete'); } if ($links) { $links = ''. implode(' · ', $links). ''; } else { $links = null; } $cache = $inline->getCache(); if (strlen($cache)) { $content = $cache; } else { $content = $this->markupEngine->markupText($content); if ($inline->getID()) { $inline->setCache($content); $inline->save(); } } $anchor = phutil_render_tag( 'a', array( 'name' => 'inline-'.$inline->getID(), ), ''); $markup = javelin_render_tag( 'div', array( 'class' => 'differential-inline-comment', 'sigil' => $sigil, 'meta' => $metadata, ), '
'. $anchor. $links. ''.$line.''. phutil_escape_html($handles[$inline->getAuthorPHID()]->getName()). '
'. - $content); + '
'. + $content. + '
'); return $this->scaffoldMarkup($markup); } private function scaffoldMarkup($markup) { if (!$this->buildScaffolding) { return $markup; } if ($this->onRight) { return ''. ''. ''. ''. ''. ''. ''. '
'.$markup.'
'; } else { return ''. ''. ''. ''. ''. ''. ''. '
'.$markup.'
'; } } } diff --git a/webroot/rsrc/css/application/maniphest/transaction-detail.css b/webroot/rsrc/css/application/maniphest/transaction-detail.css index 58e8112165..94661578d0 100644 --- a/webroot/rsrc/css/application/maniphest/transaction-detail.css +++ b/webroot/rsrc/css/application/maniphest/transaction-detail.css @@ -1,79 +1,73 @@ /** * @provides maniphest-transaction-detail-css */ .maniphest-transaction-detail-container { margin: 2px 1em 3px; background: 0px 0px no-repeat; min-height: 50px; } .maniphest-transaction-detail-container .upforgrab { border-color: #cc9966; } .maniphest-transaction-detail-container .reassigned { border-color: #0099aa; } .maniphest-transaction-detail-container .assigned { border-color: #0099aa; } .maniphest-transaction-detail-container .claimed { border-color: #0099aa; } .maniphest-transaction-detail-container .created { border-color: #660099; } .maniphest-transaction-detail-container .closed { border-color: #006699; } .maniphest-transaction-detail-container .spited { border-color: #006699; } .maniphest-transaction-detail-container .reopened { border-color: #660099; } .maniphest-transaction-detail-container .unbreaknow { border-color: #aa0000; } .maniphest-transaction-header { background: #e6e6e6; padding: 4px 1em; } .maniphest-transaction-header a { font-weight: bold; } .maniphest-transaction-detail-view { margin-left: 54px; border-color: #bbbbbb; border-width: 1px 10px; border-style: solid; min-height: 40px; } .maniphest-transaction-timestamp { float: right; font-size: 11px; color: #666666; } .maniphest-transaction-comments { padding: 4px 1em; background: #f3f3f3; } - - -.maniphest-task-description p, -.maniphest-transaction-comments p { - margin: .25em 0 .5em; -} diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index f686e6c75f..98ef494542 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -1,30 +1,38 @@ /** * @provides phabricator-remarkup-css */ +.phabricator-remarkup { + line-height: 1.45em; +} + .phabricator-remarkup p { - margin: 1em 0; + margin: 0 0 .75em; } .phabricator-remarkup code { background: #fdfae7; border: 1px solid #f5e178; display: block; white-space: pre; font-family: "Monaco", monospace; font-size: 10px; color: #000000; margin: 1em 2em; padding: .5em 1.5em; } .phabricator-remarkup code.remarkup-counterexample { border: 1px solid #aa0000; background-color: #ffaaaa; } .phabricator-remarkup ul { list-style: disc; margin: 1em 0 1em 3em; } +.phabricator-remarkup h1, +.phabricator-remarkup h2 { + margin: .75em 0 .5em; +}