Merge branch 'email-list' into 'develop'

Email list integration See merge request soapbox-pub/soapbox-fe!527
2021-06-15 22:05:45 +00:00 · 2021-06-15 22:05:45 +00:00 · 845ac6ab08
commit 845ac6ab08
parent 0cd0eb6787 eb006202e7
6 changed files with 4 additions and 0 deletions
--- a/app/soapbox/actions/email_list.js
+++ b/app/soapbox/actions/email_list.js
--- a/app/soapbox/features/admin/index.js
+++ b/app/soapbox/features/admin/index.js
--- a/app/soapbox/features/edit_profile/index.js
+++ b/app/soapbox/features/edit_profile/index.js
--- a/app/soapbox/features/landing_page/components/registration_form.js
+++ b/app/soapbox/features/landing_page/components/registration_form.js
--- a/app/soapbox/utils/features.js
+++ b/app/soapbox/utils/features.js
--- a/app/styles/components/admin.scss
+++ b/app/styles/components/admin.scss
@ -68,6 +68,10 @@
    margin-bottom: 8px;
    border-bottom: 1px solid var(--accent-color--med);
  }
+
+  a {
+    color: var(--brand-color);
+  }
 }

 .unapproved-account {