Merge branch 'master' into codeclimate-70-issue-emojiinput-scss

app/javascript/src/assets/scss/widgets/_billing.scss

@@ -1,35 +1,42 @@
 .billing {
   @include full-height;
+
   .row {
     @include full-height;
   }
+
   .billing__stats {
     @include flex;
   }
+
   .billing__form {
     @include thin-border($color-border-light);
-    @include margin($zero -$space-micro);
+    @include margin($zero - $space-micro);
     @include full-height;
     background: $color-white;
+
     iframe {
-      border: 0;
       @include full-height;
+      border: 0;
       width: 100%;
     }
   }
+
   .account-row {
     @include flex-grid-column(3, $space-medium);
     @include padding($space-normal);
-    background: $color-white;
     @include flex;
     @include flex-direction(column);
     // @include thin-border($color-border-light);
     // @include margin(-$space-micro $zero);
+    background: $color-white;
     font-size: $font-size-small;
+
     .title {
-      font-weight: $font-weight-medium;
       color: $color-heading;
+      font-weight: $font-weight-medium;
     }
+
     .value {
       font-size: $font-size-mega;
       font-weight: $font-weight-light;
@@ -41,25 +48,29 @@
 .account-locked {
   @include background-gray;
   @include margin(0);
-  .lock-message{
+}
+
+.lock-message {
+  @include flex;
+  @include full-height;
+  @include flex-direction(column);
+  @include flex-align(center, middle);
+
+  div {
     @include flex;
     @include full-height;
     @include flex-direction(column);
     @include flex-align(center, middle);
-    div {
-      @include flex;
-      @include full-height;
-      @include flex-direction(column);
-      @include flex-align(center, middle);
-      img {
-        width: 10rem;
-        @include margin($space-normal);
-      }
-      span {
-        text-align: center;
-        font-size: $font-size-small;
-        font-weight: $font-weight-medium;
-      }
+
+    img {
+      @include margin($space-normal);
+      width: 10rem;
+    }
+
+    span {
+      font-size: $font-size-small;
+      font-weight: $font-weight-medium;
+      text-align: center;
     }
   }
 }

app/javascript/src/assets/scss/widgets/_thumbnail.scss

@@ -1,14 +1,16 @@
 .user-thumbnail-box {
-  position: relative;
   @include flex-shrink;
+  position: relative;
+
   .user-thumbnail {
     border-radius: 50%;
   }
+
   .source-badge {
-    position: absolute;
+    bottom: -$space-micro / 2;
     height: $space-slab;
-    width: $space-slab;
+    position: absolute;
     right: $zero;
-    bottom: -$space-micro/2;
+    width: $space-slab;
   }
 }