@@ -130,7 +128,7 @@ const VideoPlayer = React.createClass({
);
} else {
return (
-
+
{spoilerButton}
diff --git a/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx b/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
index d20a4d170..0b7c737c6 100644
--- a/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
+++ b/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
@@ -4,8 +4,7 @@ const iconStyle = {
position: 'absolute',
right: '48px',
top: '0',
- cursor: 'pointer',
- background: '#2f3441'
+ cursor: 'pointer'
};
const ClearColumnButton = ({ onClick }) => (
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 6bb683f17..6c2e45755 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -34,7 +34,8 @@
.column-icon {
color: $color3;
-
+ background: lighten($color1, 4%);
+
&:hover {
color: lighten($color3, 7%);
}
@@ -883,6 +884,7 @@ a.status__content__spoiler-link {
.autosuggest-textarea__textarea {
height: 100px;
+ background: $color5;
}
.autosuggest-textarea__suggestions {
@@ -1020,3 +1022,23 @@ button.active i.fa-retweet {
font-size: 14px;
margin: 0;
}
+
+.loading-indicator {
+ color: #616b86;
+ color: #00FF00;
+}
+
+.collapsable-collapsed {
+ color: $color3;
+ background: lighten($color1, 4%);
+}
+
+.collapsable {
+ color: $color5;
+ background: lighten($color1, 6%);
+}
+
+.media-spoiler {
+ background: $color8;
+ color: $color5;
+}