From a9ef82febb929be1e6ccd650cbad5d9850448fc4 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sat, 16 Jun 2018 19:56:45 +0900 Subject: [PATCH] Fix autosuggest-textarea backgrounds and some minor adjustments (#7817) --- .../styles/mastodon-light/diff.scss | 92 +++++++++++-------- 1 file changed, 55 insertions(+), 37 deletions(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index fad7feb984..84ccd326ec 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -25,33 +25,51 @@ background: $ui-base-color url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; } -.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button { - color: lighten($white, 7%); +// Change the colors used in compose-form +.compose-form { + .compose-form__modifiers { + .compose-form__upload__actions .icon-button { + color: lighten($white, 7%); + + &:active, + &:focus, + &:hover { + color: $white; + } + } - &:active, - &:focus, - &:hover { - color: $white; + .compose-form__upload-description input { + color: lighten($white, 7%); + + &::placeholder { + color: lighten($white, 7%); + } + } } -} -.compose-form .compose-form__modifiers .compose-form__upload-description input { - color: lighten($white, 7%); + .compose-form__buttons-wrapper { + background: darken($ui-base-color, 6%); + } - &::placeholder { - color: lighten($white, 7%); + .autosuggest-textarea__suggestions { + background: darken($ui-base-color, 6%); } -} -.compose-form .compose-form__buttons-wrapper { - background: darken($ui-base-color, 6%); + .autosuggest-textarea__suggestions__item { + &:hover, + &:focus, + &:active, + &.selected { + background: lighten($ui-base-color, 4%); + } + } } .emoji-mart-bar { - border-color: lighten($ui-base-color, 8%); + border-color: lighten($ui-base-color, 4%); &:first-child { - background: $ui-base-color; + background: darken($ui-base-color, 6%); } } @@ -60,6 +78,7 @@ border-color: $ui-base-color; } +// Change the background colors of statuses .focusable:focus { background: $ui-base-color; } @@ -77,7 +96,7 @@ background: darken($ui-base-color, 6%); } -// Change the background color of status__content__spoiler-link +// Change the background colors of status__content__spoiler-link .reply-indicator__content .status__content__spoiler-link, .status__content .status__content__spoiler-link { background: $ui-base-lighter-color; @@ -87,8 +106,7 @@ } } -// Change the background colors of media and video spoiler - +// Change the background colors of media and video spoilers .media-spoiler, .video-player__spoiler { background: $ui-base-color; @@ -101,30 +119,30 @@ // Change the colors used in the dropdown menu .dropdown-menu { background: $ui-base-color; -} -.dropdown-menu__arrow { - &.left { - border-left-color: $ui-base-color; - } + &__arrow { + &.left { + border-left-color: $ui-base-color; + } - &.top { - border-top-color: $ui-base-color; - } + &.top { + border-top-color: $ui-base-color; + } - &.bottom { - border-bottom-color: $ui-base-color; - } + &.bottom { + border-bottom-color: $ui-base-color; + } - &.right { - border-right-color: $ui-base-color; + &.right { + border-right-color: $ui-base-color; + } } -} -.dropdown-menu__item { - a { - background: $ui-base-color; - color: $darker-text-color; + &__item { + a { + background: $ui-base-color; + color: $darker-text-color; + } } }