Page MenuHomePhabricator
Files F13996967

D12045.id28992.diff
No OneTemporary
Actions

D12045.id28992.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' => '856b962f',
+ 'core.pkg.css' => 'a4d516d3',
'core.pkg.js' => '5f50c01b',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '1940be3f',
@@ -105,7 +105,7 @@
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
'rsrc/css/application/uiexample/example.css' => '528b19de',
'rsrc/css/core/core.css' => '86bfbe8c',
- 'rsrc/css/core/remarkup.css' => '2dbff225',
+ 'rsrc/css/core/remarkup.css' => 'f65db825',
'rsrc/css/core/syntax.css' => '56c1ba38',
'rsrc/css/core/z-index.css' => '2db67397',
'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -739,7 +739,7 @@
'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => '72da38cc',
'phabricator-profile-css' => '1a20dcbf',
- 'phabricator-remarkup-css' => '2dbff225',
+ 'phabricator-remarkup-css' => 'f65db825',
'phabricator-search-results-css' => '559cc554',
'phabricator-shaped-request' => '7cbe244b',
'phabricator-side-menu-view-css' => '7e8c6341',
diff --git a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
--- a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
@@ -114,15 +114,8 @@
}
$file_data = $file->getMetadata();
- $style = null;
$height = idx($file_data, PhabricatorFile::METADATA_IMAGE_HEIGHT);
$width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH);
- if ($height && $width) {
- $style = sprintf(
- 'height: %dpx; width: %dpx;',
- $height,
- $width);
- }
$id = null;
$audio = idx($files, $macro->getAudioPHID());
@@ -154,7 +147,9 @@
'src' => $src_uri,
'alt' => $spec['original'],
'title' => $spec['original'],
- 'style' => $style,
+ 'height' => $height,
+ 'width' => $width,
+ 'class' => 'phabricator-remarkup-macro',
));
$engine->overwriteStoredText($spec['token'], $result);
diff --git a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
--- a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
@@ -55,6 +55,7 @@
array(
'src' => $uri,
'alt' => $alt_text,
+ 'class' => 'phabricator-remarkup-macro',
));
}
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -488,6 +488,11 @@
max-width: 95%;
}
+.phabricator-remarkup-macro {
+ height: auto !important;
+ max-width: 100% !important;
+}
+
.remarkup-nav-sequence-arrow {
color: {$lightgreytext};
}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 25, 1:27 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6747584
Default Alt Text
D12045.id28992.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility