Merge branch 'master' into username-change-fixes

plugins/talk-plugin-local-auth/client/components/ChangePassword.css

@@ -5,22 +5,25 @@
   border: solid 1px transparent;
   box-sizing: border-box;
   justify-content: space-between;
+  margin: 16px 0;
 
   &.editing {
     padding: 10px;
-    border-color: #979797;
     background-color: #EDEDED;
 
     .actions {
       top: 10px;
       right: 10px;
     }
+    .title {
+      margin-bottom: 1em;
+    }
   }
 }
 
 .actions {
   position: absolute;
-  top: 0px;
+  top: -6px;
   right: 0px;
   display: flex;
   flex-direction: column;
@@ -29,7 +32,7 @@
 
 .title {
   color: #202020;
-  margin: 0 0 20px;
+  margin: 0;
 }
 
 .detailBottomBox {

plugins/talk-plugin-local-auth/client/components/Profile.css

@@ -1,14 +1,16 @@
 .container {
-  margin-bottom: 20px;
+  margin-top: 6px;
+  margin-bottom: 12px;
   display: flex;
   position: relative;
   color: #202020;
-  padding: 10px;
+  padding: 5px;
   border-radius: 2px;
   box-sizing: border-box;
   justify-content: space-between;
 
   &.editing {
+    padding: 10px;
     background-color: #EDEDED;
   }
 }
@@ -37,6 +39,7 @@
 }
 
 .username {
+  margin-top: 0;
   margin-bottom: 4px;
 }