2 files changed, 22 insertions, 19 deletions
diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 9b6a2ccae..0b5cbe74f 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -4,7 +4,7 @@
     background-color: whitesmoke !important;
     color: grey;
     width: 400px;
-    height: 300px;
+    height: 250px;
 
     button {
         background: $lighter-alt-accent;
@@ -27,9 +27,10 @@
     flex-direction: column;
 
     button {
-        width: 100px;
+        width: 100%;
         align-self: center;
         background: $darker-alt-accent;
+        margin-top: 4px;
     }
 
     .delete-button {
@@ -42,14 +43,11 @@
         top: 1em;
     }
 
-
-    input {
-        border-radius: 5px;
-        border: none;
-        padding: 4px 4px 4px 10px;
-        margin: 2px;
+    .settings-heading {
+        letter-spacing: .5em;
     }
 
+
     .settings-body {
         display: flex;
         justify-content: space-between;
@@ -66,15 +64,20 @@
             padding-right: 1em;
             display: flex;
             flex-direction: column;
+            flex-basis: 65%;
             justify-content: space-around;
-            // text-align: left;
+            text-align: left;
 
             ::placeholder {
                 color: $intermediate-color;
             }
 
             input {
+                border-radius: 5px;
+                border: none;
+                padding: 4px;
                 min-width: 100%;
+                margin: 2px 0;
             }
 
             .error-text {
@@ -84,6 +87,11 @@
             .success-text {
                 color: #009F6B;
             }
+
+            p {
+                padding: 0 0 .1em .2em;
+            }
+
         }
     }
 
@@ -91,12 +99,6 @@
         text-decoration: underline;
     }
 
-    p {
-        text-align: left;
-        padding: 0;
-        margin: 0 0 20px 0;
-    }
-
     h1 {
         color: $dark-color;
         text-transform: uppercase;
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 6f852a3e6..e1fbeb138 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -91,19 +91,20 @@ export default class SettingsManager extends React.Component<{}> {
                     </div>
                     {this.settingsContent === "password" ?
                         <div className="settings-content">
-                            change password here:
                             <input placeholder="current password" ref={this.curr_password_ref} />
                             <input placeholder="new password" ref={this.new_password_ref} />
                             <input placeholder="confirm new password" ref={this.new_confirm_ref} />
+                            <button onClick={this.dispatchRequest}>submit</button>
+                            <a href="/forgotPassword">forgot password?</a>
                             {this.errorText ? <div className="error-text">{this.errorText}</div> : undefined}
                             {this.successText ? <div className="success-text">{this.successText}</div> : undefined}
-                            <button onClick={this.dispatchRequest}>submit</button> <a href="/forgotPassword">forgot password?</a>
+
                         </div>
                         : undefined}
                     {this.settingsContent === "data" ?
                         <div className="settings-content">
-                            WARNING: <br />
-                            THIS WILL ERASE ALL YOUR CURRENT DOCUMENTS STORED ON DASH. IF YOU WISH TO PROCEED, CLICK THE BUTTON BELOW.
+                            <p>WARNING: <br />
+                                THIS WILL ERASE ALL YOUR CURRENT DOCUMENTS STORED ON DASH. IF YOU WISH TO PROCEED, CLICK THE BUTTON BELOW.</p>
                             <button className="delete-button">DELETE</button>
                         </div>
                         : undefined}