Merge remote-tracking branch 'origin/develop' into chat-pagination

2020-09-04 15:42:15 -05:00 · 2020-09-04 15:42:15 -05:00 · ad3aa296cd
commit ad3aa296cd
parent 0e7132d25e e523205c5d
4 changed files with 4 additions and 0 deletions
--- a/app/soapbox/features/compose/components/privacy_dropdown.js
+++ b/app/soapbox/features/compose/components/privacy_dropdown.js
--- a/app/soapbox/features/compose/components/upload_button.js
+++ b/app/soapbox/features/compose/components/upload_button.js
--- a/app/soapbox/features/compose/index.js
+++ b/app/soapbox/features/compose/index.js
--- a/app/styles/components/tabs-bar.scss
+++ b/app/styles/components/tabs-bar.scss
@ -143,6 +143,10 @@
    .setting-toggle {
      margin-left: 10px;

+      .react-toggle-track {
+        background-color: var(--foreground-color);
+      }
+
      .react-toggle--checked {
        .react-toggle-track {
          background-color: var(--accent-color);