Merge pull request #176 from takayamaki/fix-some-theme

ハイコントラストテーマとライトテーマが壊れていた問題を修正
imas · Jul 3, 2018 · 770861c · 770861c
2 parents 0b06b6f + 7748cdc
commit 770861c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/javascript/styles/contrast.scss b/app/javascript/styles/contrast.scss
@@ -1,3 +1,5 @@
 @import 'contrast/variables';
 @import 'application';
 @import 'contrast/diff';
+@import 'theme_mastodon';
+
diff --git a/app/javascript/styles/imastodon/compose_common.scss b/app/javascript/styles/imastodon/compose_common.scss
@@ -86,7 +86,7 @@
 
   &__name {
     font-size: 14px;
-    color: $white;
+    color: $primary-text-color;
     text-decoration: none;
     width: 200px;
     overflow: hidden;

diff --git a/app/javascript/styles/imastodon/favourite_tags.scss b/app/javascript/styles/imastodon/favourite_tags.scss
@@ -18,7 +18,7 @@
   text-align: center;
 
   a {
-    color: $white;
+    color: $primary-text-color;
   }
 }
 

diff --git a/app/javascript/styles/mastodon-light.scss b/app/javascript/styles/mastodon-light.scss
@@ -1,3 +1,5 @@
 @import 'mastodon-light/variables';
 @import 'application';
 @import 'mastodon-light/diff';
+@import 'theme_mastodon';
+