treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Do not switch to italic for status media buttons

lolsob-rspec
Thibaut Girka 2019-04-21 21:44:31 +02:00 committed by ThibG
parent 22ad8c89b2
commit fea727c61a
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/components/status_content.js
View File

@ -213,6 +213,7 @@ export default class StatusContent extends React.PureComponent {
style={directionStyle} style={directionStyle}
tabIndex={!hidden ? 0 : null} tabIndex={!hidden ? 0 : null}
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
className='status__text'
lang={status.get('language')} lang={status.get('language')}
/> />
{media} {media}
@ -233,6 +234,7 @@ export default class StatusContent extends React.PureComponent {
ref={this.setRef} ref={this.setRef}
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
lang={status.get('language')} lang={status.get('language')}
className='status__text'
tabIndex='0' tabIndex='0'
/> />
{media} {media}
@ -245,7 +247,7 @@ export default class StatusContent extends React.PureComponent {
style={directionStyle} style={directionStyle}
tabIndex='0' tabIndex='0'
> >
<div ref={this.setRef} dangerouslySetInnerHTML={content} lang={status.get('language')} tabIndex='0' /> <div ref={this.setRef} className='status__text' dangerouslySetInnerHTML={content} lang={status.get('language')} tabIndex='0' />
{media} {media}
</div> </div>
); );

42
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -31,31 +31,33 @@
} }
} }
h1, h2, h3, h4, h5 { .status__text {
margin-top: 20px; h1, h2, h3, h4, h5 {
margin-bottom: 20px; margin-top: 20px;
} margin-bottom: 20px;
}
h1, h2 { h1, h2 {
font-weight: 500; font-weight: 500;
font-size: 18px; font-size: 18px;
} }
h2 { h2 {
font-size: 16px; font-size: 16px;
} }
blockquote { blockquote {
margin-left: 20px; margin-left: 20px;
color: $dark-text-color; color: $dark-text-color;
} }
b, strong { b, strong {
font-weight: 500; font-weight: 500;
} }
em, i { em, i {
font-style: italic; font-style: italic;
}
} }
a { a {