Page MenuHomePhabricator
Files F13817914

D12251.diff
No OneTemporary
Actions

D12251.diff
View Options

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' => 'ad650d52',
+ 'core.pkg.css' => '0e73b9f2',
'core.pkg.js' => '0c88e7f6',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '3500921f',
@@ -29,7 +29,7 @@
'rsrc/css/aphront/table-view.css' => '3e77fefe',
'rsrc/css/aphront/tokenizer.css' => '82ce2142',
'rsrc/css/aphront/tooltip.css' => '7672b60f',
- 'rsrc/css/aphront/transaction.css' => '042fc4bb',
+ 'rsrc/css/aphront/transaction.css' => 'bd9f9f6e',
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
'rsrc/css/aphront/typeahead.css' => '0e403212',
'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
@@ -46,7 +46,7 @@
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
'rsrc/css/application/conpherence/durable-column.css' => 'caa12d4a',
'rsrc/css/application/conpherence/menu.css' => '7c900089',
- 'rsrc/css/application/conpherence/message-pane.css' => '44154798',
+ 'rsrc/css/application/conpherence/message-pane.css' => 'e44b667b',
'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
'rsrc/css/application/conpherence/update.css' => '1099a660',
'rsrc/css/application/conpherence/widget-pane.css' => '1979ee8c',
@@ -516,7 +516,7 @@
'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => 'caa12d4a',
'conpherence-menu-css' => '7c900089',
- 'conpherence-message-pane-css' => '44154798',
+ 'conpherence-message-pane-css' => 'e44b667b',
'conpherence-notification-css' => '04a6e10a',
'conpherence-thread-manager' => 'bb928342',
'conpherence-update-css' => '1099a660',
@@ -748,7 +748,7 @@
'phabricator-textareautils' => '5c93c52c',
'phabricator-title' => '5c1c758c',
'phabricator-tooltip' => '1d298e3a',
- 'phabricator-transaction-view-css' => '042fc4bb',
+ 'phabricator-transaction-view-css' => 'bd9f9f6e',
'phabricator-ui-example-css' => '528b19de',
'phabricator-uiexample-javelin-view' => 'd4a14807',
'phabricator-uiexample-reactor-button' => 'd19198c8',
diff --git a/src/view/layout/PhabricatorTransactionView.php b/src/view/layout/PhabricatorTransactionView.php
--- a/src/view/layout/PhabricatorTransactionView.php
+++ b/src/view/layout/PhabricatorTransactionView.php
@@ -62,7 +62,7 @@
$info = $this->renderTransactionInfo();
$actions = $this->renderTransactionActions();
- $style = $this->renderTransactionStyle();
+ $image = $this->renderTransactionImage();
$content = $this->renderTransactionContent();
$classes = implode(' ', $this->classes);
@@ -77,11 +77,11 @@
array(
'class' => 'phabricator-transaction-view '.$classes,
'id' => $transaction_id,
- 'style' => $style,
),
- phutil_tag_div(
- 'phabricator-transaction-detail grouped',
- array($header, $content)));
+ array(
+ $image,
+ phutil_tag_div('phabricator-transaction-detail grouped',
+ array($header, $content)),));
}
@@ -137,9 +137,14 @@
return $this->actions;
}
- private function renderTransactionStyle() {
+ private function renderTransactionImage() {
if ($this->imageURI) {
- return 'background-image: url('.$this->imageURI.');';
+ return phutil_tag(
+ 'span',
+ array(
+ 'class' => 'phabricator-transaction-image',
+ 'style' => 'background-image: url('.$this->imageURI.');',
+ ));
} else {
return null;
}
diff --git a/webroot/rsrc/css/aphront/transaction.css b/webroot/rsrc/css/aphront/transaction.css
--- a/webroot/rsrc/css/aphront/transaction.css
+++ b/webroot/rsrc/css/aphront/transaction.css
@@ -7,6 +7,7 @@
margin: 1em 0 1.25em;
min-height: 50px;
padding: 2px 0px;
+ position: relative;
}
.device-phone .phabricator-transaction-view {
@@ -59,3 +60,13 @@
div.phabricator-remarkup + .phabricator-transaction-subheader {
margin-top: 12px;
}
+
+.phabricator-transaction-image {
+ float: left;
+ border-radius: 3px;
+ height: 35px;
+ width: 35px;
+ background-size: 35px;
+ position: absolute;
+ top: 5px;
+}
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -68,6 +68,10 @@
padding-bottom: 20px;
}
+.conpherence-message-pane .conpherence-edited + .date-marker {
+ margin-top: 24px;
+}
+
.device .conpherence-message-pane .conpherence-messages {
left: 0;
right: 0;

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 21, 4:06 AM (20 h, 30 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6624786
Default Alt Text
D12251.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility