Merge branch 'master' into username-change-fixes

2026-08-15 12:55:10 +08:00 · 2018-05-04 11:58:46 -06:00
parent 6bad9e5306 ade9b99a09
commit f2d8e49d5b
2 changed files with 11 additions and 5 deletions
@@ -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;
 }