Merge branch 'master' into patch-3

1 files changed, 59 insertions, 3 deletions

diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 6bb683f17..faad9ee58 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%);
   }
@@ -226,6 +227,8 @@ a.status__content__spoiler-link {
 }
 
 .detailed-status {
+  background: lighten($color1, 4%);
+  
   .status__content {
     font-size: 19px;
     line-height: 24px;
@@ -298,7 +301,8 @@ a.status__content__spoiler-link {
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
-
+  color: $color3;
+  
   p {
     margin-bottom: 20px;
 
@@ -851,7 +855,8 @@ a.status__content__spoiler-link {
 
 .column-link {
   background: lighten($color1, 6%);
-
+  color: $color5;
+  
   &:hover {
     background: lighten($color1, 11%);
   }
@@ -883,6 +888,7 @@ a.status__content__spoiler-link {
 
 .autosuggest-textarea__textarea {
   height: 100px;
+  background: $color5;
 }
 
 .autosuggest-textarea__suggestions {
@@ -1020,3 +1026,53 @@ button.active i.fa-retweet {
   font-size: 14px;
   margin: 0;
 }
+
+.loading-indicator {
+  color: $color2;
+}
+
+.collapsable-collapsed {
+  color: $color3;
+  background: lighten($color1, 4%);
+}
+
+.collapsable {
+  color: $color5;    
+  background: lighten($color1, 6%);
+}
+
+.media-spoiler {
+  background: $color8;
+  color: $color5;
+}
+
+.modal-container--preloader {
+  background: lighten($color1, 6%);
+}
+
+.account--panel {
+  background: lighten($color1, 4%);
+  border-top: 1px solid lighten($color1, 6%);
+  border-bottom: 1px solid lighten($color1, 6%);
+}
+
+.column-settings--outer {
+  background: lighten($color1, 6%);
+}
+
+.column-settings--section {
+  color: $color3;
+}
+
+.modal-container--nav {
+  color: $color5;
+}
+
+.account--follows-info {
+  color: $color5;
+}
+
+.setting-toggle {
+  color: $color3;
+}
+