mastofe

commit: 41f5459af5c30ac71096a1d1efc38837ab940acf
parent: 10ffd455a8f5b423624a3d5696043efa07eccf03
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed, 25 Jan 2017 02:16:36 +0100

Merge pull request #524 from blackle/master

fix up spoilers
Diffstat:
M
app/assets/javascripts/components/components/status_content.jsx
2
+-
M
app/assets/stylesheets/components.scss
34
----------------------------------

2 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
@@ -92,7 +92,7 @@ const StatusContent = React.createClass({
 
       return (
         <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
-          <p>
+          <p style={{ marginBottom: hidden ? '0px' : '' }} >
             <span dangerouslySetInnerHTML={spoilerContent} /> <a onClick={this.handleSpoilerClick}>{toggleText}</a>
           </p>
 
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
@@ -679,42 +679,8 @@
   }
 }
 
-.spoiler-helper {
-  margin-bottom: -20px !important;
-}
-
-.spoiler {
-  &::before {
-    margin-top: 20px;
-    display: block;
-    content: '';
-  }
-
-  display: inline;
-  cursor: pointer;
-  border-bottom: 1px dashed white;
-  .light & {
-    border-bottom: 1px dashed black;
-  }
-
-  &.spoiler-on {
-    &, & * {
-      color: transparent !important;
-    }
-    background: white;
-    .light & {
-      background: black;
-    }
-
-    .emojione {
-      opacity: 0;
-    }
-  }
-}
-
 @import 'boost';
 
-
 button i.fa-retweet {
   height: 19px;
   width: 22px;