Skip to content

Commit

Permalink
#2658 Fix rendering of markdown images in IE11 (#2659)
Browse files Browse the repository at this point in the history
* Update corejs modules

* Update CHANGELOG.md

* Fix render of markdown images in IE11

* Update CHANGELOG.md

* Update packages/component/src/Styles/StyleSet/TextContent.js

Co-Authored-By: William Wong <compulim@users.noreply.github.com>
  • Loading branch information
corinagum and compulim committed Dec 3, 2019
1 parent 08563a9 commit 0fcd7fe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -63,7 +63,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Resolves [#2620](https://github.com/microsoft/BotFramework-WebChat/issues/2620). Adds Chinese localization files, by [@spyip](https://github.com/spyip) in PR [#2631](https://github.com/microsoft/BotFramework-WebChat/pull/2631)
- Fixes [#2639](https://github.com/microsoft/BotFramework-WebChat/issues/2639). Fix passed in prop time from string to boolean, by [@corinagum](https://github.com/corinagum) in PR [#2640](https://github.com/microsoft/BotFramework-WebChat/pull/2640)
- `component`: Updated timer to use functional component, by [@spyip](https://github.com/spyip) in PR [#2546](https://github.com/microsoft/BotFramework-WebChat/pull/2546)
- Fixes [#2651](https://github.com/microsoft/BotFramework-WebChat/issues/2651). Add `ends-with` string module to ES5 bundle, by [@corinagum](https://github.com/corinagum) in PR [#2654](https://github.com/microsoft/BotFramework-WebChat/pull/2654)
- Fixes [#2651](https://github.com/microsoft/BotFramework-WebChat/issues/2651). Add `ends-with` string module to es5 bundle, by [@corinagum](https://github.com/corinagum) in PR [#2654](https://github.com/microsoft/BotFramework-WebChat/pull/2654)
- Fixes [#2658](https://github.com/microsoft/BotFramework-WebChat/issues/2658). Fix rendering of markdown images in IE11, by [@corinagum](https://github.com/corinagum) in PR [#2659](https://github.com/microsoft/BotFramework-WebChat/pull/2659)

### Changed

Expand Down
5 changes: 3 additions & 2 deletions packages/component/src/Styles/StyleSet/TextContent.js
@@ -1,6 +1,6 @@
/* eslint no-magic-numbers: "off" */

export default function createTextContentStyle({ bubbleMinHeight, primaryFont, paddingRegular }) {
export default function createTextContentStyle({ bubbleMaxWidth, bubbleMinHeight, primaryFont, paddingRegular }) {
return {
fontFamily: primaryFont,
margin: 0,
Expand All @@ -17,7 +17,8 @@ export default function createTextContentStyle({ bubbleMinHeight, primaryFont, p

'&.markdown': {
'& img': {
maxWidth: '100%'
maxWidth: bubbleMaxWidth,
width: '100%'
},

'& pre': {
Expand Down

0 comments on commit 0fcd7fe

Please sign in to comment.