From 659f972bed63d9e8f18791ba4e0f779169f5fb4e Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 21 Apr 2019 21:44:31 +0200 Subject: [PATCH] Do not switch to italic for status media buttons --- .../glitch/components/status_content.js | 4 +- .../glitch/styles/components/status.scss | 42 ++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/javascript/flavours/glitch/components/status_content.js b/app/javascript/flavours/glitch/components/status_content.js index ae14c949a1a..fc11b809174 100644 --- a/app/javascript/flavours/glitch/components/status_content.js +++ b/app/javascript/flavours/glitch/components/status_content.js @@ -213,6 +213,7 @@ export default class StatusContent extends React.PureComponent { style={directionStyle} tabIndex={!hidden ? 0 : null} dangerouslySetInnerHTML={content} + className='status__text' lang={status.get('language')} /> {media} @@ -233,6 +234,7 @@ export default class StatusContent extends React.PureComponent { ref={this.setRef} dangerouslySetInnerHTML={content} lang={status.get('language')} + className='status__text' tabIndex='0' /> {media} @@ -245,7 +247,7 @@ export default class StatusContent extends React.PureComponent { style={directionStyle} tabIndex='0' > -
+
{media}
); diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index ce07bd64ab2..91467c88652 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -31,31 +31,33 @@ } } - h1, h2, h3, h4, h5 { - margin-top: 20px; - margin-bottom: 20px; - } + .status__text { + h1, h2, h3, h4, h5 { + margin-top: 20px; + margin-bottom: 20px; + } - h1, h2 { - font-weight: 500; - font-size: 18px; - } + h1, h2 { + font-weight: 500; + font-size: 18px; + } - h2 { - font-size: 16px; - } + h2 { + font-size: 16px; + } - blockquote { - margin-left: 20px; - color: $dark-text-color; - } + blockquote { + margin-left: 20px; + color: $dark-text-color; + } - b, strong { - font-weight: 500; - } + b, strong { + font-weight: 500; + } - em, i { - font-style: italic; + em, i { + font-style: italic; + } } a {