Cleanup, deduplicate, debug user css, separated user-info component css

app/assets/javascripts/discourse/templates/user.hbs

@@ -116,7 +116,6 @@
         <div style='clear: both'></div>
       </div>
 
-
       {{#unless collapsedInfo}}
       <div class='secondary'>
         <dl>

app/assets/stylesheets/common/base/user-badges.scss

@@ -58,19 +58,6 @@
   }
 }
 
-.user-info.medium.badge-info {
-  min-height: 80px;
-
-  .granted-on {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  }
-
-  .post-link {
-    display: block;
-    margin-top: 0.2em;
-  }
-}
-
 .show-badge .badge-user-info {
   .earned {
     font-size: 1.3em;

app/assets/stylesheets/common/base/user.scss

@@ -1,8 +1,265 @@
 // Common styles for "/user" section
+.user-right {
+  .list-actions {
+    margin-bottom: 10px;
+
+    .btn {
+      margin-right: 10px;
+    }
+  }
+}
+
 .user-main {
   .d-icon-heart {
     color: $love !important;
   }
+
+  .about {
+    overflow: hidden;
+    width: 100%;
+
+    .secondary {
+      font-size: 0.929em;
+
+      .btn {
+        padding: 3px 12px;
+      }
+
+      dl {
+        margin: 0;
+      }
+
+      dd {
+        padding: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: $primary;
+
+        &.groups {
+          span:after {
+            content: ','
+          }
+          span:last-of-type:after {
+            content:''
+          }
+        }
+      }
+
+      dt {
+        color: $secondary-medium;
+        margin: 0;
+        display: inline-block;
+      }
+    }
+
+    .details {
+      background: rgba($secondary, .85);
+
+      blockquote {
+        background-color: $secondary-low;
+        border-left-color: $secondary-low;
+      }
+
+      h1 {
+        font-size: 2.143em;
+        font-weight: normal;
+        i {font-size: .8em;}
+      }
+
+      h2 {
+        font-size: 1.214em;
+        font-weight: normal;
+        margin-top: 10px;
+        max-width: 100%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      h3 {
+        font-weight: normal;
+        font-size: 1em;
+        margin: 5px 0;
+        i:not(:first-of-type) {
+          margin-left: 10px;
+        }
+      }
+
+      .groups {
+        margin-left: 10px;
+        display: inline;
+      }
+
+      img.avatar {
+        float: left;
+      }
+
+      .suspended {
+        color: $danger;
+      }
+
+      .primary {
+        width: 100%;
+        position: relative;
+        float: left;
+
+        h1 {
+          font-weight: bold;
+        }
+
+        .bio {
+          max-height: 300px;
+          overflow: auto;
+
+          a[href] {
+            text-decoration: underline;
+          }
+
+          img {
+            max-width: 100%;
+          }
+        }
+      }
+    }
+
+    .controls {
+      ul {
+        list-style-type: none;
+      }
+
+      a {
+        padding: 5px 10px;
+        margin-bottom: 10px;
+      }
+    }
+
+    &.collapsed-info {
+      .controls {
+        margin-top: 0;
+      }
+
+      .profile-image {
+        height: 0;
+      }
+
+      .details {
+        margin-top: 0;
+        background: rgba($secondary, .85);
+
+        .bio {
+          display: none;
+        }
+
+        .primary {
+          text-align: left;
+          margin-top: 0;
+          width: 100%;
+
+          .avatar {
+            float: left;
+            margin-right: 10px;
+            width: 45px;
+            height: 45px;
+          }
+
+          h1 {
+            font-size: 1.429em;
+          }
+
+          h2 {
+            font-size: 1.071em;
+            margin-top: 4px;
+          }
+
+          h3 {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+
+  .staff-counters {
+    text-align: left;
+    background: $primary;
+
+    > div {
+      margin: 0 10px 0 0;
+      display: inline-block;
+      padding: 5px 0;
+      &:first-of-type {
+        padding-left: 10px;
+      }
+      span {
+        padding: 1px 5px;
+        border-radius: 10px;
+      }
+    }
+
+    a {
+      color: $secondary;
+    }
+
+    .active {
+      font-weight: bold;
+    }
+  }
+
+  .pill {
+    border-radius: 15px;
+    display: inline-block;
+    height: 30px;
+    width: 30px;
+    text-align: center;
+    vertical-align: middle;
+    line-height: 30px;
+  }
+
+  .helpful-flags {
+    background-color: green;
+  }
+
+  .flagged-posts {
+    background-color: #E49735;
+  }
+
+  .warnings-received {
+    background-color: #EC441B;
+  }
+
+  .deleted-posts {
+    background-color: #EC441B;
+  }
+
+  .suspensions {
+    background-color: #c22020;
+  }
+
+  .user-field {
+    clear: both;
+    margin-bottom: 10px;
+
+    &.text {
+      padding-top: 18px;
+    }
+
+    .controls {
+      label {
+        width: auto;
+        text-align: left;
+        font-weight: normal;
+        float: auto;
+      }
+
+      .instructions {
+        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        margin-top: 5px;
+        margin-bottom: 10px;
+        font-size: 80%;
+        line-height: 1.4em;
+      }
+    }
+  }
 }
 
 .user-field {
@@ -17,24 +274,26 @@
 .public-user-fields {
   margin-top: 8px;
   margin-bottom: 8px;
+
   .user-field-name {
     font-weight: bold;
   }
-}
 
-.collapsed-info .public-user-fields {
+  .collapsed-info & {
     display: none;
+  }
 }
 
 .user-navigation {
-
   .map {
     height: 50px;
   }
+
   .avatar {
     float: left;
     width: 45px;
   }
+
   nav.buttons {
     width: 180px;
     padding: 0;
@@ -44,6 +303,7 @@
       box-sizing: border-box;
     }
   }
+
   h2 {
     a {
       font-size: 1em;
@@ -51,7 +311,6 @@
       cursor: pointer;
     }
   }
-
 }
 
 .user-table {
@@ -78,69 +337,6 @@
   margin-bottom: 15px;
 }
 
-.user-info {
-  display: inline-block;
-  clear: both;
-  margin-bottom: 1em;
-
-  .user-image {
-    float: left;
-    padding-right: 4px;
-  }
-
-  .user-detail {
-    float: left;
-    width: 70%;
-    padding-left: 5px;
-    font-size: 13px;
-
-    .name-line {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .username a {
-      font-weight: bold;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
-    }
-
-    .name {
-      margin-left: 5px;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
-    }
-
-    .title {
-      margin-top: 3px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    }
-  }
-}
-
-.user-info.small {
-  width: 333px;
-}
-
-.user-info.medium {
-  width: 480px;
-  min-height: 60px;
-
-  .user-image {
-    width: 55px;
-  }
-  .user-detail {
-    width: 380px;
-  }
-
-  .username, .name {
-    display: block;
-  }
-
-  .name {
-    margin-left: 0;
-  }
-}
-
 .user-nav {
   margin: 5px 0px;
   padding-top: 10px;
@@ -150,15 +346,6 @@
   }
 }
 
-.user-right {
-  .list-actions {
-    margin-bottom: 10px;
-    .btn {
-      margin-right: 10px;
-    }
-  }
-}
-
 .top-section {
   @include clearfix();
   ul {
@@ -229,6 +416,11 @@
   .topic-info {
     color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
   }
+
+  @media all and (max-width : 600px) {
+    float: none;
+    width: 100%;
+  }
 }
 
 .replies-section,
@@ -252,19 +444,62 @@
   }
 }
 
-@media all
+.groups {
-and (max-width : 600px) {
+  .group-link {
-  .top-sub-section {
+    color: $tertiary;
-    float: none;
-    width: 100%;
   }
 }
 
-.user-preferences .tags .select2-container-multi {
+.user-preferences {
+  textarea {
+    height: 100px;
+  }
+
+  .static {
+    color: $primary;
+    display: inline-block;
+  }
+
+  .instructions {
+    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    margin-bottom: 10px;
+    font-size: 80%;
+    line-height: 1.4em;
+
+    a[href] {
+      color: $tertiary;
+    }
+  }
+
+  .avatar {
+    margin-left: 3px;
+  }
+
+  .warning {
+    background-color: scale-color($danger, $lightness: 30%);
+    padding: 5px 8px;
+    color: $secondary;
+    width: 520px;
+  }
+
+  .category-notifications .category-controls,
+  .tag-notifications .tag-controls {
+    margin-top: 24px;
+  }
+
+  .tags .select2-container-multi {
     border: 1px solid $primary-low;
     width: 540px;
     border-radius: 0;
     .select2-choices {
       border: none;
     }
+  }
+}
+
+.paginated-topics-list {
+  .user-content {
+    width: 100%;
+    margin-top: 0;
+  }
 }

app/assets/stylesheets/common/components/user-info.scss

@@ -0,0 +1,68 @@
+// Common styles for "user-info" component
+.user-info {
+  display: inline-block;
+  clear: both;
+  margin-bottom: 1em;
+
+  .user-image {
+    float: left;
+    padding-right: 4px;
+  }
+
+  .user-detail {
+    float: left;
+    width: 70%;
+    padding-left: 5px;
+    font-size: 13px;
+
+    .name-line {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .username a {
+      font-weight: bold;
+      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    }
+
+    .name {
+      margin-left: 5px;
+      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    }
+
+    .title {
+      margin-top: 3px;
+      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    }
+  }
+
+  &.small {
+    width: 333px;
+  }
+
+  &.medium {
+    min-height: 60px;
+
+    .username, .name {
+      display: block;
+    }
+
+    .name {
+      margin-left: 0;
+    }
+
+    &.badge-info {
+      min-height: 80px;
+
+      .granted-on {
+        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      }
+
+      .post-link {
+        display: block;
+        margin-top: 0.2em;
+      }
+    }
+  }
+}

app/assets/stylesheets/desktop/components/user-info.scss

@@ -0,0 +1,14 @@
+.user-info {
+  &.medium {
+    width: 480px;
+
+    .user-image {
+      width: 55px;
+    }
+
+    .user-detail {
+      width: 380px;
+    }
+
+  }
+}

app/assets/stylesheets/desktop/user.scss

@@ -1,7 +1,17 @@
 // Desktop styles for "/user" section
-.groups {
+.user-right {
-  .group-link {
+  display: table-cell;
-    color: $tertiary;
+
+  &,
+  > .user-stream {
+    > .alert:first-child {
+      margin-top: 10px;
+    }
+  }
+
+  .group-notification-menu {
+    float: right;
+    margin-bottom: 5px;
   }
 }
 
@@ -18,81 +28,6 @@
   }
 }
 
-.user-preferences {
-  display: table-cell;
-  vertical-align: top;
-  padding-top: 10px;
-  padding-left: 30px;
-
-  h3 {
-    color: $primary;
-    margin: 20px 0 10px 0;
-  }
-
-  input.category-selector, input.user-selector, input.tag-chooser {
-    width: 530px;
-  }
-
-  textarea {
-    width: 530px;
-    height: 100px;
-  }
-
-  input[type=text] {
-    @include small-width {
-      width: 450px;
-    }
-  }
-
-  .static {
-    color: $primary;
-    display: inline-block;
-  }
-  .instructions {
-    display: inline-block;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    margin-top: 0;
-    margin-bottom: 10px;
-    font-size: 80%;
-    line-height: 1.4em;
-  }
-  .form-horizontal .instructions {
-    margin-left: 160px;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $tertiary;
-  }
-  .warning {
-    background-color: scale-color($danger, $lightness: 30%);
-    padding: 5px 8px;
-    color: $secondary;
-    width: 520px;
-  }
-
-  .pref-mailing-list-mode .controls {
-    select {
-      width: 400px;
-    }
-  }
-
-  .notifications, .category-notifications, .tag-notifications, .user-custom-preferences-outlet {
-    .controls select {
-      width: 280px;
-    }
-  }
-
-  .category-notifications .category-controls, .tag-notifications .tag-controls {
-    margin-top: 24px;
-  }
-}
-
-.user-main .user-preferences .user-field.text {
-  padding-top: 0;
-}
-
 .form-horizontal .control-group.category {
   margin-top: 18px;
 }
@@ -101,6 +36,7 @@
   width: 100%;
   display: table;
   table-layout: fixed;
+
   .wrapper {
     display: table-row;
   }
@@ -138,12 +74,6 @@
   }
 }
 
-.viewing-self .user-main .about.collapsed-info {
-  .secondary, .staff-counters {
-    display: inherit;
-  }
-}
-
 .user-content {
   padding: 10px 8px;
   background-color: $secondary;
@@ -206,8 +136,6 @@
   .about {
     background-position: center center;
     background-size: cover;
-    width: 100%;
-    overflow: hidden;
 
     &.group {
       .details {
@@ -221,108 +149,33 @@
       background: scale-color($secondary, $lightness: -5%);
       border-top: 1px solid $primary-low;
       border-bottom: 1px solid $primary-low;
-      font-size: 0.929em;
-
-      .btn {
-        padding: 3px 12px;
-      }
-
-      dl dd {
-        display: inline;
-        margin: 0 10px 0 0;
-        padding: 0;
-      }
-
-      dl dt {
-        display: inline-block;
-        margin: 0 5px 0 0;
-        padding: 0;
-      }
 
       dl {
-        margin: 0;
         padding: 8px 10px;
       }
 
       dd {
-        overflow: hidden;
+        display: inline;
-        text-overflow: ellipsis;
+        margin: 0 10px 0 0;
-        color: $primary;
-      }
-
-      dd.groups {
-        span:after {
-          content: ','
-        }
-        span:last-of-type:after {
-          content:''
-        }
       }
 
       dt {
-        color: $secondary-medium;
+        margin: 0 5px 0 0;
-        margin: 0;
+        padding: 0;
       }
     }
 
     .details {
       padding: 0 0 4px 0;
-      background: rgba($secondary, .85);
       margin-top: -200px;
       transition: margin .15s linear;
 
-      blockquote {
-        background-color: $secondary-low;
-        border-left-color: $secondary-low;
-      }
-
-      h1 {
-        font-size: 2.143em;
-        font-weight: normal;
-        i {font-size: .8em;}
-      }
-
-      h2 {
-        font-size: 1.214em;
-        font-weight: normal;
-        margin-top: 10px;
-        max-width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      h3 {
-        font-weight: normal;
-        font-size: 1em;
-        margin: 5px 0;
-        i:not(:first-of-type) {
-          margin-left: 10px;
-        }
-      }
-
-      .groups {
-        margin-left: 10px;
-        display: inline;
-      }
-
       img.avatar {
         margin: 0 20px 10px 0;
-        float: left;
         transition: all .1s linear;
       }
 
-      .suspended {
-        color: $danger;
-      }
-
       .primary {
-        width: 100%;
-        position: relative;
-        float: left;
-
-        h1 {font-weight: bold;}
-
         .primary-textual {
           padding: 3px;
           a[href] {
@@ -331,21 +184,11 @@
         }
 
         .bio {
-          max-height: 300px;
-          overflow: auto;
           max-width: 750px;
 
-          a[href] {
-            text-decoration: underline;
-          }
-
           a.mention {
             text-decoration: none;
           }
-
-          img {
-            max-width: 100%;
-          }
         }
       }
     }
@@ -361,13 +204,9 @@
       float: right;
       text-align: right;
       width: 180px;
-      ul {
+
-        list-style-type: none;
-      }
       a {
-        padding: 5px 10px;
         width: 140px;
-        margin-bottom: 10px;
       }
 
       .right {
@@ -378,10 +217,14 @@
 
     &.collapsed-info {
       .controls {
-        margin-top: 0;
         width: auto;
+
         ul {
-          li {display: inline;}
+
+          li {
+            display: inline;
+          }
+
           a {
             padding: 5px 10px;
             margin-bottom: 10px;
@@ -390,164 +233,104 @@
         }
       }
 
-      .staff-counters {
-        display: none;
-      }
-
-      .secondary {
-        display: none;
-      }
-
-      .profile-image {
-        height: 0;
-      }
-
       .details {
         padding: 0 0 2px 0;
-        margin-top: 0;
-        background: rgba($secondary, .85);
         border-bottom: 1px solid $primary-low;
-        .bio {
-          display: none;
-        }
-
-        .primary {
-          text-align: left;
-          margin-top: 0;
-          width: 100%;
-
-          .avatar {
-            float: left;
-            margin-right: 10px;
-            width: 45px;
-            height: 45px;
-          }
-
-          h1 {
-            font-size: 1.429em;
-          }
-
-          h2 {
-            font-size: 1.071em;
-            margin-top: 4px;
-          }
-
-          h3 {
-            display: none;
-          }
-        }
       }
 
       &.has-background {
-        .details {  padding: 12px 15px 2px 15px;}
+        .details {
+          padding: 12px 15px 2px 15px;
+        }
       }
     }
   }
 
   .staff-counters {
-    text-align: left;
-    background: $primary;
     color: $secondary;
     margin-bottom: 20px;
-    a {
-      color: $secondary;
-    }
-    > div {
-      margin: 0 10px 0 0;
-      display: inline-block;
-      padding: 5px 0;
-      &:first-of-type {
-        padding-left: 10px;
-      }
-      span {
-        padding: 1px 5px;
-        border-radius: 10px;
-      }
-    }
-    .active {
-      font-weight: bold;
-    }
-  }
-
-  .pill {
-    border-radius: 15px;
-    display: inline-block;
-    height: 30px;
-    width: 30px;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 30px;
-  }
-  .helpful-flags {
-    background-color: green;
-  }
-  .flagged-posts {
-    background-color: #E49735;
-  }
-  .warnings-received {
-    background-color: #EC441B;
-  }
-  .deleted-posts {
-    background-color: #EC441B;
-  }
-  .suspensions {
-    background-color: #c22020;
-  }
-
-  .user-field.text {
-    padding-top: 18px;
   }
 
   .user-field {
     input[type=text] {
       width: 530px;
     }
+
     .controls {
-      label {
-        width: auto;
-        text-align: left;
-        font-weight: normal;
-        float: auto;
-      }
       .instructions {
         display: block;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        margin-top: 5px;
-        margin-bottom: 10px;
-        font-size: 80%;
-        line-height: 1.4em;
       }
     }
-    clear: both;
-    margin-bottom: 10px;
   }
+
   .group-notification-menu .dropdown-menu {
     top: 30px;
     bottom: auto;
     left: auto;
     right: 10px;
   }
+
+  .viewing-self & .about.collapsed-info {
+    .secondary, .staff-counters {
+      display: inherit;
+    }
+  }
 }
 
-.paginated-topics-list {
+.user-preferences {
-  .user-content {
+  display: table-cell;
-    width: 100%;
+  vertical-align: top;
+  padding-top: 10px;
+  padding-left: 30px;
+
+  h3 {
+    color: $primary;
+    margin: 20px 0 10px 0;
+  }
+
+  textarea {
+    width: 530px;
+  }
+
+  input {
+    &.category-selector,
+    &.user-selector,
+    &.tag-chooser {
+      width: 530px;
+    }
+
+    &[type=text] {
+      @include small-width {
+        width: 450px;
+      }
+    }
+  }
+
+  .instructions {
+    display: inline-block;
     margin-top: 0;
   }
-}
 
-.user-right {
+  .form-horizontal .instructions {
-  display: table-cell;
+    margin-left: 160px;
+  }
 
-  &,
+  .pref-mailing-list-mode .controls {
-  > .user-stream {
+    select {
-    > .alert:first-child {
+      width: 400px;
-      margin-top: 10px;
     }
   }
 
-  .group-notification-menu {
+  .notifications,
-    float: right;
+  .category-notifications,
-    margin-bottom: 5px;
+  .tag-notifications,
+  .user-custom-preferences-outlet {
+    .controls select {
+      width: 280px;
+    }
+  }
+
+  .user-main & .user-field.text {
+    padding-top: 0;
   }
 }

app/assets/stylesheets/mobile/components/user-info.scss

@@ -0,0 +1,14 @@
+// Mobile styles for "user-info" component
+.user-info {
+  &.medium {
+    width: 300px;
+
+    .user-image {
+      width: auto;
+    }
+
+    .user-detail {
+      width: 240px;
+    }
+  }
+}

app/assets/stylesheets/mobile/user.scss

@@ -8,140 +8,6 @@
   }
 }
 
-.user-preferences {
-  .control-group {
-    padding: 8px 36px 8px 8px;
-  }
-  textarea {
-    width: 530px;
-    height: 100px;
-  }
-  .static {
-    color: $primary;
-    margin-top: 5px;
-    margin-left: 5px;
-    display: inline-block;
-  }
-  .instructions {
-    color: $primary;
-    margin-top: 5px;
-  }
-  .category-controls {
-    padding-top: 8px;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $primary;
-  }
-  .warning {
-    @include border-radius-all(6px);
-    background-color: $danger;
-    padding: 5px 8px;
-    color: $primary;
-    width: 520px;
-  }
-
-  .controls-dropdown {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    padding-left: 5px;
-    select {
-      width: 280px;
-    }
-  }
-
-  .save-button {
-    width: 100%;
-    overflow: auto;
-    max-width: 200px;
-    button {
-      display: block;
-    }
-  }
-
-  .delete-account {
-    overflow: hidden;
-  }
-
-  .checkbox-label {
-    overflow: auto;
-    display: block;
-    width: 100%;
-    padding: 5px 8px;
-  }
-
-  textarea {width: 100%;}
-
-  .desktop-notifications button {
-    float: none;
-  }
-  .apps .controls button {
-    float: right;
-  }
-  .category-notifications .category-controls, .tag-notifications .tag-controls {
-    margin-top: 24px;
-  }
-}
-
-.profile-image {
-  height: 25px;
-  width: 100%;
-}
-
-
-.groups {
-  .group-link {
-    color: $tertiary;
-  }
-}
-
-.hasBackground .details {margin-top: 200px;
-}
-
-.user-preferences {
-  input.category-selector {
-  }
-
-  textarea {
-    height: 100px;
-  }
-
-  input[type=text] {
-    @include small-width {
-    }
-  }
-
-  .static {
-    color: $primary;
-    display: inline-block;
-  }
-  .instructions {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    margin-top: 5px;
-    margin-bottom: 10px;
-    font-size: 80%;
-    line-height: 1.4em;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $tertiary;
-  }
-  .warning {
-    background-color: scale-color($danger, $lightness: 30%);
-    padding: 5px 8px;
-    color: $secondary;
-  }
-
-}
-
-.form-horizontal .control-group.category {
-  margin-top: 18px;
-}
-
 .user-main {
 
   table.group-members {
@@ -205,98 +71,31 @@
 
   .about {
     background: dark-light-diff($primary, $secondary, 0%, -75%) center;
-    width: 100%;
     margin-bottom: 10px;
-    overflow: hidden;
     color: $secondary;
 
     .secondary {
       background: $primary-low;
-      font-size: 0.929em;
-
-      .btn { padding: 3px 12px; }
-
-      dl dd {
-        margin: 0 15px 0 5px;
-        padding: 0;
-      }
-
-      dl dt {
-        display: inline-block;
-      }
 
       dl {
         padding: 10px 15px;
-        margin: 0;
       }
 
       dd {
-        overflow: hidden;
+        margin: 0 15px 0 5px;
-        text-overflow: ellipsis;
-        color: $primary;
-      }
-
-      dt {
-        color: $secondary-medium;
-        margin: 0;
       }
     }
 
     .details {
-      padding: 15px 10px 4px 10px;
+      padding: 15px 0 4px 0;
-      background: rgba($secondary, .85);
-
-      blockquote {
-        background-color: $secondary-low;
-        border-left-color: $secondary-low;
-      }
 
       h1 {
-        font-size: 2.143em;
-        font-weight: normal;
         margin: 10px 0 0 0;
       }
 
-      h2 {
-        font-size: 1.214em;
-        font-weight: normal;
-        margin-top: 10px;
-        max-width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      h3 {
-        font-weight: normal;
-        font-size: 1em;
-        margin: 5px 0;
-        i:not(:first-of-type) {
-          margin-left: 10px;
-        }
-      }
-
-      .groups {
-        margin-left: 10px;
-        display: inline;
-        }
-
-      img.avatar {
-        float: left;
-      }
-
-      .suspended {
-        color: $danger;
-      }
-
       .primary {
-        width: 100%;
-        position: relative;
-        float: left;
         color: $primary;
 
-        h1 {font-weight: bold;}
-
         .primary-textual {
           float: left;
           padding-left: 15px;
@@ -307,17 +106,7 @@
 
         .bio {
           color: $primary;
-          max-height: 300px;
-          overflow: auto;
           max-width: 700px;
-
-          a[href] {
-            text-decoration: underline;
-          }
-
-          img {
-            max-width: 100%;
-          }
         }
       }
     }
@@ -325,119 +114,26 @@
     .controls {
       float: left;
       padding-left: 15px;
+
       ul {
-        list-style-type: none;
         margin: 0;
       }
+
       a {
-        padding: 5px 10px;
         width: 120px;
-        margin-bottom: 10px;
-      }
       }
     }
 
-  .about.collapsed-info {
+    &.collapsed-info {
-    .controls {
-      margin-top: 0;
-
-    }
-
-    .staff-counters {
-      display: none;
-    }
-    .secondary { display: none; }
-
-    .profile-image {
-      height: 0;
-    }
-
       .details {
         padding: 12px 15px 2px 15px;
-      margin-top: 0;
-      background: rgba($secondary, .85);
-      .bio { display: none; }
-
-      .primary {
-        text-align: left;
-        margin-top: 0;
-        width: 100%;
-
-        .avatar {
-          float: left;
-          margin-right: 10px;
-          width: 45px;
-          height: 45px;
-        }
-
-        h1 {
-          font-size: 1.429em;
-        }
-
-        h2 {
-          font-size: 1.071em;
-          margin-top: 4px;
-        }
-
-        h3 {
-          display: none;
-        }
       }
     }
   }
 
   .staff-counters {
-    text-align: left;
-    background: $primary;
     padding: 7px 0;
     display: inline;
-    > div {
-      margin: 0 10px 0 0;
-      display: inline-block;
-      padding: 5px 0;
-      &:first-of-type {
-        padding-left: 10px;
-        }
-      span {
-        padding: 1px 5px;
-        border-radius: 10px;
-        }
-
-    }
-    a {
-      color: $secondary;
-    }
-    .active {
-      font-weight: bold;
-    }
-  }
-  .pill {
-    border-radius: 15px;
-    display: inline-block;
-    height: 30px;
-    width: 30px;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 30px;
-  }
-  .helpful-flags {
-    background-color: green;
-  }
-  .flagged-posts {
-    background-color: #E49735;
-  }
-  .warnings-received {
-    background-color: #EC441B;
-  }
-  .deleted-posts {
-    background-color: #EC441B;
-  }
-  .suspensions {
-    background-color: #c22020;
-  }
-
-  .user-field.text {
-    padding-top: 18px;
   }
 
   .user-field {
@@ -446,61 +142,96 @@
       text-align: left;
       font-weight: bold;
     }
-    .controls {
-      label {
-        width: auto;
-        text-align: left;
-        font-weight: normal;
-        float: auto;
-      }
-      .instructions {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        margin-top: 5px;
-        margin-bottom: 10px;
-        font-size: 80%;
-        line-height: 1.4em;
-      }
-    }
-    clear: both;
-    margin-bottom: 10px;
   }
 }
 
+.profile-image {
+  height: 25px;
+  width: 100%;
+}
+
+.has-background .details {
+  margin-top: 200px;
+}
+
+.form-horizontal .control-group.category {
+  margin-top: 18px;
+}
+
 .paginated-topics-list {
   margin-top: 20px;
-
-  .user-content {
-    width: 100%;
-    margin-top: 0;
-  }
 }
 
 // mobile fixups for badges
-
 .badge-card.medium {
   width: 300px;
 }
 
-.show-badge-details {
-  margin-bottom: 1em;
-}
-
 .user-badges {
   margin-bottom: 2em;
 }
 
-.show-badge-details .badge-grant-info {
+.show-badge-details {
+  margin-bottom: 1em;
+
+  .badge-grant-info {
     display: none;
+  }
 }
 
-.user-info.medium {
+.user-preferences {
-  width: 300px;
+  .control-group {
-}
+    padding: 8px 36px 8px 8px;
+  }
 
-.user-info.medium .user-detail {
+  .static {
-  width: 240px;
+    margin-top: 5px;
-}
+    margin-left: 5px;
+  }
 
-.user-info.medium .user-image {
+  .instructions {
-  width: auto;
+    margin-top: 5px;
+  }
+
+  .category-controls {
+    padding-top: 8px;
+  }
+
+  .controls-dropdown {
+    margin-top: 10px;
+    margin-bottom: 15px;
+    padding-left: 5px;
+
+    select {
+      width: 280px;
+    }
+  }
+
+  .save-button {
+    width: 100%;
+    overflow: auto;
+    max-width: 200px;
+
+    button {
+      display: block;
+    }
+  }
+
+  .delete-account {
+    overflow: hidden;
+  }
+
+  .checkbox-label {
+    overflow: auto;
+    display: block;
+    width: 100%;
+    padding: 5px 8px;
+  }
+
+  .desktop-notifications button {
+    float: none;
+  }
+  .apps .controls button {
+    float: right;
+  }
 }