diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-29 13:52:26 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-29 13:52:26 +0200 |
commit | c087738270e7fb16b1d284e8dd72cf99b4238bb8 (patch) | |
tree | 23327fe190fd90589c9dc8d64e96fcf0b7d28ddd /app/javascript/styles/mastodon-light | |
parent | 8b98afa781018bc7cfdb325f6b1fca0b1edcd8cb (diff) | |
parent | 90908fc24ba57c877de75fe117b8cc234e29d4f0 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles/mastodon-light')
-rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 2b88b830c..fe304317d 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -132,20 +132,54 @@ .boost-modal, .confirmation-modal, .mute-modal, -.report-modal { +.report-modal, +.embed-modal, +.error-modal, +.onboarding-modal { background: $ui-base-color; } .boost-modal__action-bar, .confirmation-modal__action-bar, -.mute-modal__action-bar { +.mute-modal__action-bar, +.onboarding-modal__paginator, +.error-modal__footer { background: darken($ui-base-color, 6%); + + .onboarding-modal__nav, + .error-modal__nav { + &:hover, + &:focus, + &:active { + background-color: darken($ui-base-color, 12%); + } + } +} + +.display-case__case { + background: $white; +} + +.embed-modal .embed-modal__container .embed-modal__html { + background: $white; + + &:focus { + background: darken($ui-base-color, 6%); + } } .react-toggle-track { background: $ui-secondary-color; } +.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track { + background: darken($ui-secondary-color, 10%); +} + +.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track { + background: lighten($ui-highlight-color, 10%); +} + // Change the default color used for the text in an empty column or on the error column .empty-column-indicator, .error-column { |