);
@@ -98,4 +106,4 @@ DangerZone.propTypes = propTypes;
export default connect(
mapStateToProps,
mapDispatchToProps
-)(DangerZone);
\ No newline at end of file
+)(DangerZone);
diff --git a/client/src/components/settings/DeleteModal.js b/client/src/components/settings/DeleteModal.js
index f622e4d9aa..ec1335e12b 100644
--- a/client/src/components/settings/DeleteModal.js
+++ b/client/src/components/settings/DeleteModal.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { ButtonSpacer } from '../helpers';
-import { Button, Modal } from '@freecodecamp/react-bootstrap'
+import { Button, Modal } from '@freecodecamp/react-bootstrap';
import './danger-zone.css';
@@ -20,20 +20,22 @@ function DeleteModal(props) {
autoFocus={true}
backdrop={true}
bsSize='lg'
+ className='text-center'
keyboard={true}
onHide={onHide}
- show={show}>
+ show={show}
+ >
Delete My Account
- This will really delete all your data, including all your progress
- and account information.
+ This will really delete all your data, including all your progress and
+ account information.
- We won't be able to recover any of it for you later,
- even if you change your mind.
+ We won't be able to recover any of it for you later, even if you
+ change your mind.
If there's something we could do better, send us an email instead and
@@ -48,8 +50,9 @@ function DeleteModal(props) {
bsSize='lg'
bsStyle='primary'
className='btn-invert'
+ onClick={props.onHide}
type='button'
- onClick={props.onHide}>
+ >
Nevermind, I don't want to delete my account
@@ -58,8 +61,9 @@ function DeleteModal(props) {
bsSize='lg'
bsStyle='danger'
className='btn-danger'
+ onClick={props.delete}
type='button'
- onClick={props.delete}>
+ >
I am 100% certain. Delete everything related to this account
@@ -73,4 +77,4 @@ function DeleteModal(props) {
DeleteModal.displayName = 'DeleteModal';
DeleteModal.propTypes = propTypes;
-export default DeleteModal;
\ No newline at end of file
+export default DeleteModal;
diff --git a/client/src/components/settings/ResetModal.js b/client/src/components/settings/ResetModal.js
index 9dd22f54b7..6058224635 100644
--- a/client/src/components/settings/ResetModal.js
+++ b/client/src/components/settings/ResetModal.js
@@ -2,13 +2,11 @@ import React from 'react';
import PropTypes from 'prop-types';
import { ButtonSpacer } from '../helpers';
-import { Button, Modal } from '@freecodecamp/react-bootstrap'
-
-import './DangerZone'
+import { Button, Modal } from '@freecodecamp/react-bootstrap';
const propTypes = {
- reset: PropTypes.func.isRequired,
onHide: PropTypes.func.isRequired,
+ reset: PropTypes.func.isRequired,
show: PropTypes.bool
};
@@ -20,9 +18,11 @@ function ResetModal(props) {
autoFocus={true}
backdrop={true}
bsSize='lg'
+ className='text-center'
keyboard={true}
onHide={onHide}
- show={show}>
+ show={show}
+ >
Reset My Progress
@@ -42,8 +42,9 @@ function ResetModal(props) {
bsSize='lg'
bsStyle='primary'
className='btn-invert'
+ onClick={props.onHide}
type='button'
- onClick={props.onHide}>
+ >
Nevermind, I don't want to delete all of my progress
@@ -52,8 +53,9 @@ function ResetModal(props) {
bsSize='lg'
bsStyle='danger'
className='btn-danger'
+ onClick={props.reset}
type='button'
- onClick={props.reset}>
+ >
Reset everything. I want to start from the beginning
@@ -67,4 +69,4 @@ function ResetModal(props) {
ResetModal.displayName = 'ResetModal';
ResetModal.propTypes = propTypes;
-export default ResetModal;
\ No newline at end of file
+export default ResetModal;
diff --git a/client/src/components/settings/danger-zone.css b/client/src/components/settings/danger-zone.css
index 40b4434326..dabe3de039 100644
--- a/client/src/components/settings/danger-zone.css
+++ b/client/src/components/settings/danger-zone.css
@@ -1,4 +1,21 @@
.btn-danger {
background-color: #fff;
- color: #f11e00;
-}
\ No newline at end of file
+ color: #ad1601;
+ border-color: #ad1601;
+}
+
+.btn-danger:hover, .btn-danger:focus {
+ background-color: #ad1601;
+}
+.danger-zone .panel-heading {
+ background-color: #ad1601;
+ color: #fff;
+}
+
+.danger-zone .panel-danger {
+ border-color: #ad1601;
+}
+
+.danger-zone p {
+ color: #ad1601;
+}