From 7748cdc9dde2a464e58055ae94c958a7735a549a Mon Sep 17 00:00:00 2001 From: takayamaki Date: Tue, 3 Jul 2018 21:58:51 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=82=B3=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E3=83=88=E3=83=86=E3=83=BC=E3=83=9E=E3=81=A8?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=83=86=E3=83=BC=E3=83=9E=E3=81=8C?= =?UTF-8?q?=E5=A3=8A=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - お気に入りタグ周りでwhiteベタ書きしていた部分をprimary-text-colorに修正 --- app/javascript/styles/contrast.scss | 2 ++ app/javascript/styles/imastodon/compose_common.scss | 2 +- app/javascript/styles/imastodon/favourite_tags.scss | 2 +- app/javascript/styles/mastodon-light.scss | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/javascript/styles/contrast.scss b/app/javascript/styles/contrast.scss index 5b43aecbe7d876..98fd797c57ff77 100644 --- 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 index a31b997f898850..37b24c93c26421 100644 --- 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 index 425ba6006c1e44..0d0dbea51ef07f 100644 --- 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 index 756a12d868961c..0867a3e0f24bd5 100644 --- 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'; +