]> cat aescling's git repositories - mastodon.git/commitdiff
Do not switch to italic for status media buttons
authorThibaut Girka <thib@sitedethib.com>
Sun, 21 Apr 2019 19:44:31 +0000 (21:44 +0200)
committerThibG <thib@sitedethib.com>
Mon, 22 Apr 2019 21:07:14 +0000 (23:07 +0200)
app/javascript/flavours/glitch/components/status_content.js
app/javascript/flavours/glitch/styles/components/status.scss

index ae14c949a1a34bb5a8b1395f444f5ba47ecc8e17..fc11b8091740465adcb5d357612fa39c55bf7e26 100644 (file)
@@ -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'
         >
-          <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}
         </div>
       );
index ce07bd64ab26ca11f273822630dd20c03bf6d49d..91467c8865212cca6097b8f0e7e4bad7ae32c634 100644 (file)
     }
   }
 
-  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 {