From 8a06d3d312762ecf4fe48b9e862b786c9399e304 Mon Sep 17 00:00:00 2001
From: minusfive <mail@minusfive.com>
Date: Thu, 24 Aug 2017 17:40:57 -0400
Subject: [PATCH] Fix + remove unnecessary indentation, dead code, cleanup
 user.css

---
 app/assets/stylesheets/common/base/user.scss |   5 +
 app/assets/stylesheets/desktop/user.scss     | 282 +++++++++----------
 app/assets/stylesheets/mobile/discourse.scss |   6 +-
 app/assets/stylesheets/mobile/user.scss      |  34 +--
 4 files changed, 155 insertions(+), 172 deletions(-)

diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 70926d68a3e..d6a7eefb76f 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -92,6 +92,11 @@
 
 }
 
+.user-table {
+  position: relative;
+  margin-top: 20px;
+}
+
 .avatar-selector {
   label {
     display: inline-block;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index aad15295747..45700c1f627 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -98,7 +98,6 @@
 }
 
 .user-table {
-  margin-top: 30px;
   width: 100%;
   display: table;
   table-layout: fixed;
@@ -143,83 +142,65 @@
   }
 }
 
+.user-content {
+  padding: 10px 8px;
+  background-color: $secondary;
+  margin-bottom: 10px;
+  box-sizing: border-box;
+
+  .btn.right {
+    float: right
+  }
+
+  h2 {
+    margin-bottom: 10px;
+  }
+}
+
+.pref-avatar {
+  .avatar {
+    max-width: 45px;
+    max-height: 45px;
+  }
+}
+
+.user-invite-list {
+  width: 100%;
+  margin-top: 15px;
+
+  th {
+    text-align: left;
+    border-bottom: 3px solid $primary-low;
+    padding: 0 0 10px 0;
+    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    font-weight: normal;
+  }
+
+  td {
+    padding: 10px 0 10px 0;
+    border-bottom: 1px solid $primary-low;
+  }
+}
+
+.user-invite-controls {
+  background-color: $primary-low;
+  padding: 5px 10px 0px 0;
+  height: 35px;
+}
+
+.user-invite-search {
+  clear: both;
+  margin: 15px 0px -15px 0px;
+}
+
+.user-invite-none {
+  clear: both;
+  padding: 15px;
+}
+
 .user-main {
   margin-bottom: 50px;
 
-  // name hacky so lastpass does not freak out
-  // -search- means it is bypassed
-  #add-user-to-group {
-    button, .ac-wrap {
-      float: left;
-    }
-    button {
-      margin-top: 5px;
-    }
-    #user-search-selector {
-      width: 400px;
-    }
-   }
-
-  .user-right {
-    display: table-cell;
-  }
-
-  .user-content {
-    padding: 10px 8px;
-    background-color: $secondary;
-    margin-bottom: 10px;
-    box-sizing: border-box;
-
-    .btn.right {
-      float: right
-    }
-
-    h2 {
-      margin-bottom: 10px;
-    }
-
-    .user-invite-list {
-      width: 100%;
-      margin-top: 15px;
-
-      th {
-        text-align: left;
-        border-bottom: 3px solid $primary-low;
-        padding: 0 0 10px 0;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        font-weight: normal;
-      }
-
-      td {
-        padding: 10px 0 10px 0;
-        border-bottom: 1px solid $primary-low;
-      }
-    }
-
-    .pref-avatar {
-      .avatar {
-        max-width: 45px;
-        max-height: 45px;
-      }
-    }
-
-    .user-invite-controls {
-      background-color: $primary-low;
-      padding: 5px 10px 0px 0;
-      height: 35px;
-    }
-
-    .user-invite-search {
-      clear: both;
-      margin: 15px 0px -15px 0px;
-    }
-
-    .user-invite-none {
-      clear: both;
-      padding: 15px;
-    }
-  }
-
   .about {
     background-position: center center;
     background-size: cover;
@@ -234,12 +215,15 @@
       }
     }
 
-  .secondary {
-    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; }
+    .secondary {
+      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;
@@ -318,7 +302,7 @@
       .groups {
         margin-left: 10px;
         display: inline;
-        }
+      }
 
       img.avatar {
         margin: 0 20px 10px 0;
@@ -363,16 +347,21 @@
         }
       }
     }
-        &.has-background {
-          .details { padding: 15px 15px 4px 15px;}
-        }
+
+    &.has-background {
+      .details {
+        padding: 15px 15px 4px 15px;
+      }
+    }
 
     .controls {
       padding: 0 0 12px 0;
       float: right;
       text-align: right;
       width: 180px;
-      ul {list-style-type: none;}
+      ul {
+        list-style-type: none;
+      }
       a {
         padding: 5px 10px;
         width: 140px;
@@ -384,70 +373,73 @@
         margin-left: 5px;
       }
     }
-  }
 
-  .about.collapsed-info {
-    .controls {
-      margin-top: 0;
-      width: auto;
-      ul {
-        li {display: inline;}
-        a {
-          padding: 5px 10px;
-          margin-bottom: 10px;
-          width: auto;
-          }
-      }
-    }
-
-    .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;
+    &.collapsed-info {
+      .controls {
         margin-top: 0;
-        width: 100%;
-
-        .avatar {
-          float: left;
-          margin-right: 10px;
-          width: 45px;
-          height: 45px;
+        width: auto;
+        ul {
+          li {display: inline;}
+          a {
+            padding: 5px 10px;
+            margin-bottom: 10px;
+            width: auto;
+            }
         }
+      }
 
-        h1 {
-          font-size: 1.429em;
-        }
+      .staff-counters {
+        display: none;
+      }
 
-        h2 {
-          font-size: 1.071em;
-          margin-top: 4px;
-        }
+      .secondary {
+        display: none;
+      }
 
-        h3 {
+      .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;}
       }
     }
-
-    &.has-background {
-      .details {  padding: 12px 15px 2px 15px;}
-    }
-
   }
 
   .user-stream {
@@ -643,7 +635,11 @@
   }
 }
 
-.user-right .group-notification-menu {
-  float: right;
-  margin-bottom: 5px;
+.user-right {
+  display: table-cell;
+
+  .group-notification-menu {
+    float: right;
+    margin-bottom: 5px;
+  }
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 18726ee67e6..b4337cfe676 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -100,10 +100,6 @@ h2#site-text-logo
   font-weight: normal;
 }
 
-.user-table {
-  position: relative;
-}
-
 .mobile-view .mobile-nav {
   &.messages-nav, &.notifications-nav, &.activity-nav, &.preferences-nav {
     position: absolute;
@@ -123,7 +119,7 @@ h2#site-text-logo
   }
   margin: 0;
   padding: 0;
-  background: $primary-low; 
+  background: $primary-low;
   list-style: none;
   overflow: visible;
   position: relative;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 3bcb6fb7454..313bb363e6a 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -134,18 +134,6 @@
   margin-top: 18px;
 }
 
-.user-navigation {
-  width: 100%;
-  margin-top: 20px;
-  min-height: 20px;
-
-  h3 {
-    color: $primary;
-    margin: 10px;
-  }
-
-}
-
 .user-main {
 
   table.group-members {
@@ -159,11 +147,11 @@
     th {
       padding: 0.5em;
       text-align: right;
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
     }
     td {
       padding: 0.5em;
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
       img {
         margin-right: 10px;
       }
@@ -196,13 +184,13 @@
 
       th {
         text-align: left;
-        border-bottom: 1px solid $primary-low; 
+        border-bottom: 1px solid $primary-low;
         padding: 5px;
       }
 
       td {
         padding: 5px;
-        border-bottom: 1px solid $primary-low; 
+        border-bottom: 1px solid $primary-low;
       }
     }
   }
@@ -215,7 +203,7 @@
     color: $secondary;
 
     .secondary {
-      background: $primary-low; 
+      background: $primary-low;
       font-size: 0.929em;
 
       .btn { padding: 3px 12px; }
@@ -251,8 +239,8 @@
       background: rgba($secondary, .85);
 
       blockquote {
-        background-color: $secondary-low; 
-        border-left-color: $secondary-low; 
+        background-color: $secondary-low;
+        border-left-color: $secondary-low;
       }
 
       h1 {
@@ -392,6 +380,8 @@
 
 
   .user-stream {
+    padding-top: 20px;
+
     .excerpt {
       margin: 5px 0;
       font-size: 0.929em;
@@ -412,7 +402,7 @@
     .item {
       padding: 20px 0 15px 0;
       background-color: $secondary;
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
     }
     .type {
       color: $primary;
@@ -586,10 +576,6 @@
   }
 }
 
-.user-archive {
-  display: inline-block;
-}
-
 // mobile fixups for badges
 
 .badge-card.medium {