Merge branch 'rebased-redesign' into 'master'

Rebased redesign See merge request bloodyhealth/drip!305

Merge branch 'rebased-redesign' into 'master'
3efc4efc · Sofiya Tepikin · 0451b078 · 199aa198 · 3efc4efc · 3efc4efc
Commit 3efc4efc authored 4 years ago by Sofiya Tepikin
--- a/components/settings/shared/alert-error.js
+++ b/components/settings/shared/alert-error.js
--- a/components/settings/shared/confirm-with-password.js
+++ b/components/settings/shared/confirm-with-password.js
--- a/components/settings/shared/password-field.js
+++ b/components/settings/shared/password-field.js
--- a/components/settings/shared/settings-button.js
+++ b/components/settings/shared/settings-button.js
--- a/components/settings/data-management/delete-data.js
+++ b/components/settings/data-management/delete-data.js
--- a/components/settings/data-management/export-dialog.js
+++ b/components/settings/data-management/export-dialog.js
--- a/components/settings/data-management/import-dialog.js
+++ b/components/settings/data-management/import-dialog.js
--- a/components/settings/data-management/index.js
+++ b/components/settings/data-management/index.js
--- a/components/settings/index.js
+++ b/components/settings/index.js
--- a/components/settings/license.js
+++ b/components/settings/license.js
--- a/components/settings/menu-item.js
+++ b/components/settings/menu-item.js
--- a/components/settings/nfp-settings/index.js
+++ b/components/settings/nfp-settings/index.js
--- a/components/settings/nfp-settings/slider-label.js
+++ b/components/settings/nfp-settings/slider-label.js
--- a/components/settings/nfp-settings/temp-slider.js
+++ b/components/settings/nfp-settings/temp-slider.js
--- a/components/settings/nfp-settings/temperature-slider.js
+++ b/components/settings/nfp-settings/temperature-slider.js
--- a/components/settings/nfp-settings/use-cervix.js
+++ b/components/settings/nfp-settings/use-cervix.js
--- a/components/settings/password/create.js
+++ b/components/settings/password/create.js
--- a/components/settings/password/delete.js
+++ b/components/settings/password/delete.js
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
--- a/components/settings/password/index.js
+++ b/components/settings/password/index.js