diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-12 20:54:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 20:54:13 +0100 |
| commit | 988f5bf0266483659b03f1b0926d0b9ff9e85a8f (patch) | |
| tree | 1e0a0011a890729f45c0d364641c266864e78d02 /app/javascript/flavours/glitch | |
| parent | 2c8bb1745359a3bf200d37383dc56d5951e2b6bc (diff) | |
| parent | 8d4b5ee3ef5e8df3a92e19f2c3f3a4560341eef3 (diff) | |
Merge pull request #1716 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/mastodon-light/diff.scss | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 87b83b563..020d39aff 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -116,7 +116,8 @@ } .dropdown-menu__item { - a { + a, + button { background: $ui-base-color; color: $ui-secondary-color; } @@ -172,7 +173,15 @@ } } -.dropdown-menu__separator { +.dropdown-menu__separator, +.dropdown-menu__item.edited-timestamp__history__item, +.dropdown-menu__container__header, +.compare-history-modal .report-modal__target, +.report-dialog-modal .poll__option.dialog-option { + border-bottom-color: lighten($ui-base-color, 12%); +} + +.report-dialog-modal__container { border-bottom-color: lighten($ui-base-color, 12%); } @@ -233,6 +242,7 @@ .embed-modal, .error-modal, .onboarding-modal, +.compare-history-modal, .report-modal__comment .setting-text__wrapper, .report-modal__comment .setting-text, .report-dialog-modal__textarea { |