fix up spoilers

diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index ff90226d8f476a34c8e87f266db6afea3164a852..fbb413465c2bf96eada55bad76143a8ab603f7c1 100644 (file)
--- 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
index dee53dcc78351db29f143ab19a1a972b3c1dc1bd..2a8093be756c67e0c939e82f60f57a95b5a03ecf 100644 (file)
--- 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;