about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-12 11:51:25 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-03-12 11:51:25 +0100
commitbb9a6fb5c239f4846e2e20c8435edb46f0c7c548 (patch)
tree2f6120abc31a698b1e1a7dbf442383a79d42ee77 /app/javascript/styles
parent2c8bb1745359a3bf200d37383dc56d5951e2b6bc (diff)
parentd3aa9cf7744eede43c5c1b9097eb1f0720185ccd (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon-light/diff.scss14
1 files changed, 12 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 7a2dd0330..2c8162b28 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -304,7 +304,8 @@ html {
   }
 
   &__item {
-    a {
+    a,
+    button {
       background: $white;
       color: $darker-text-color;
     }
@@ -336,10 +337,18 @@ html {
   color: $white;
 }
 
-.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, 4%);
 }
 
+.report-dialog-modal__container {
+  border-top-color: lighten($ui-base-color, 4%);
+}
+
 // Change the background colors of modals
 .actions-modal,
 .boost-modal,
@@ -351,6 +360,7 @@ html {
 .embed-modal,
 .error-modal,
 .onboarding-modal,
+.compare-history-modal,
 .report-modal__comment .setting-text__wrapper,
 .report-modal__comment .setting-text,
 .announcements,