From 44f6321336f0a00278ef1af037ddb917892fa845 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 16 Jun 2017 09:41:36 -0400 Subject: [PATCH] RN-187 Fixed right margin for block quotes (#638) --- app/components/markdown/index.js | 2 +- app/components/markdown/markdown_block_quote.js | 13 ++++++++----- app/utils/markdown.js | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/components/markdown/index.js b/app/components/markdown/index.js index 00cff842a..6dce3f1c5 100644 --- a/app/components/markdown/index.js +++ b/app/components/markdown/index.js @@ -202,7 +202,7 @@ export default class Markdown extends React.PureComponent { renderBlockQuote = ({children, ...otherProps}) => { return ( {children} diff --git a/app/components/markdown/markdown_block_quote.js b/app/components/markdown/markdown_block_quote.js index 93038d3b8..e2d49fd7e 100644 --- a/app/components/markdown/markdown_block_quote.js +++ b/app/components/markdown/markdown_block_quote.js @@ -12,7 +12,7 @@ import CustomPropTypes from 'app/constants/custom_prop_types'; export default class MarkdownBlockQuote extends PureComponent { static propTypes = { - blockStyle: CustomPropTypes.Style, + iconStyle: CustomPropTypes.Style, children: CustomPropTypes.Children.isRequired }; @@ -22,11 +22,11 @@ export default class MarkdownBlockQuote extends PureComponent { - + {this.props.children} @@ -36,7 +36,10 @@ export default class MarkdownBlockQuote extends PureComponent { const style = StyleSheet.create({ container: { - flexDirection: 'row', - alignItems: 'flex-start' + alignItems: 'flex-start', + flexDirection: 'row' + }, + childContainer: { + flex: 1 } }); diff --git a/app/utils/markdown.js b/app/utils/markdown.js index 99acb7c14..7fcb88452 100644 --- a/app/utils/markdown.js +++ b/app/utils/markdown.js @@ -83,7 +83,7 @@ export const getMarkdownBlockStyles = makeStyleSheetFromTheme((theme) => { flex: 1, marginVertical: 10 }, - quoteBlock: { + quoteBlockIcon: { color: changeOpacity(theme.centerChannelColor, 0.5), padding: 5 }