From b731d5d9b5a317a1449b4feb8eab98225143d74a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 23 Feb 2018 21:41:40 -0500
Subject: [PATCH] Removing unneeded and duplicate styles

---
 .../stylesheets/common/base/directory.scss    | 31 +++++------
 .../stylesheets/common/base/header.scss       |  3 --
 .../stylesheets/common/base/history.scss      |  6 +++
 app/assets/stylesheets/common/base/login.scss | 12 +++++
 app/assets/stylesheets/common/base/modal.scss | 54 ++++++++++++++++++-
 app/assets/stylesheets/desktop.scss           |  1 -
 app/assets/stylesheets/desktop/history.scss   |  9 +---
 app/assets/stylesheets/desktop/login.scss     | 13 -----
 .../stylesheets/desktop/menu-panel.scss       | 12 -----
 app/assets/stylesheets/desktop/modal.scss     | 47 ----------------
 app/assets/stylesheets/mobile.scss            |  1 -
 app/assets/stylesheets/mobile/directory.scss  | 20 +------
 app/assets/stylesheets/mobile/emoji.scss      |  2 -
 app/assets/stylesheets/mobile/faqs.scss       |  3 +-
 app/assets/stylesheets/mobile/history.scss    |  5 --
 app/assets/stylesheets/mobile/login.scss      | 10 +---
 app/assets/stylesheets/mobile/menu-panel.scss |  7 ---
 app/assets/stylesheets/mobile/modal.scss      | 44 +--------------
 18 files changed, 89 insertions(+), 191 deletions(-)
 delete mode 100644 app/assets/stylesheets/desktop/menu-panel.scss
 delete mode 100644 app/assets/stylesheets/mobile/menu-panel.scss

diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 0a03b208717..65114a11b57 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,10 +1,10 @@
 .directory {
   margin-bottom: 100px;
-
+  
   .user-info {
     margin-bottom: 0;
   }
-
+  
   .period-chooser {
     float: left;
   }
@@ -18,16 +18,16 @@
   .spinner {
     clear: both;
   }
-
+  
   table {
     width: 100%;
     margin-bottom: 1em;
-
+    
     td, th {
       padding: 0.5em;
       text-align: left;
       border-bottom: 1px solid $primary-low; 
-
+      
       .number, .time-read {
         font-size: $font-up-3;
         color: $primary-medium; 
@@ -36,21 +36,10 @@
         white-space: nowrap;
       }
     }
-
-    tr.me {
-      td {
-        background-color: dark-light-choose($highlight-low, $highlight-medium);
-
-        .username a, .name, .title, .number, .time-read {
-          color: $primary-medium;
-        }
-      }
-    }
-
+    
     th.sortable {
       cursor: pointer;
       white-space: nowrap;
-
       width: 13%;
       .d-icon-heart {
         color: $love;
@@ -59,10 +48,16 @@
       .d-icon-chevron-down, .d-icon-chevron-up {
         margin-left: 0.5em;
       }
-
+      
       &:hover {
         background-color: $primary-low; 
       }
     }
   }
+  .me {
+    background-color: dark-light-choose($highlight-low, $highlight-medium);
+    .username a, .name, .title, .number, .time-read {
+      color: $primary-medium;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 4daaeafac0a..7a9f1ce1731 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -50,9 +50,6 @@
     margin-left: 7px;
   }
 
-  .d-header-icons {
-    float: right;
-  }
 }
 
 .header-dropdown-toggle, .drop-down, .panel-body {
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index a1faeea65ec..cb11152e064 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -24,6 +24,12 @@
     }
   }
 
+  #revision-details {
+    padding: 5px;
+    margin-top: 10px;
+    border-bottom: 3px solid $primary-low; 
+  }
+
   #revisions .row:first-of-type {
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 1c471da2f84..a5a68a84da1 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -12,6 +12,18 @@
   display: none;
 }
 
+#login-form {
+  a {
+    color: dark-light-choose($primary-high, $secondary-low);
+  }
+  td {
+    padding-right: 5px;
+  }
+}
+
+#new-account-link {
+  cursor: pointer;
+}
 
 $label-width: 92px;
 $input-width: 220px;
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 03d2cd55174..2195c8e0186 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -111,6 +111,7 @@
   z-index: z("modal","content");
   overflow: auto;
 }
+
 .modal-form {
   margin-bottom: 0;
 }
@@ -156,6 +157,8 @@
   .modal-body {
     box-sizing: border-box;
     width: 100%;
+    overflow-y: auto;
+    max-height: 400px;
     &.full-height-modal {
       max-height: calc(100vh - 150px);
     }
@@ -413,7 +416,6 @@
   }
 }
 
-
 .change-timestamp {
   
     .date-picker {
@@ -434,5 +436,55 @@
     form {
       margin: 0;
     }
+}
+
+.flag-modal {
+  max-height: 450px;
+  .flag-action-type-details {
+    line-height: $line-height-large;
   }
+}
+
+.flag-message {
+  width: 95% !important;
+  margin: 0;
+}
+
+.custom-message-length {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  font-size: $font-down-1;
+}
+
+.edit-category-modal {
+  .secure-category-options {
+    margin: 10px 0 0 16px;
+    .badge-list {
+      margin: 10px 0;
+      li {
+        margin: 0 4px 8px 0;
+        a {
+          color: dark-light-choose($primary-medium, $secondary-medium);
+          cursor: pointer;
+        }
+        a:hover {
+          color: dark-light-choose($primary-medium, $secondary-medium);
+        }
+      }
+    }
+  }
+}
+
+.tabbed-modal {
+  .modal-body {
+    position: relative;
+    height: 350px;
+  }
+}
+
+
+.modal-tab {
+  position: absolute;
+  width: 95%;
+}
+
   
\ No newline at end of file
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 8534c2f7834..e11252ac35a 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -19,7 +19,6 @@
 @import "desktop/user";
 @import "desktop/history";
 @import "desktop/queued-posts";
-@import "desktop/menu-panel";
 @import "desktop/group";
 
 // Import all component-specific files
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 8481485d104..3192d0b9b2e 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -7,9 +7,6 @@
     max-width: 960px;
   }
   #revision-controls {
-    float: left;
-    padding-right: 5px;
-
     .btn[disabled] {
       cursor: not-allowed;
       background-color: $primary-low; 
@@ -32,11 +29,7 @@
       font-weight: bold;
     }
   }
-  #revision-details {
-    padding: 5px;
-    margin-top: 10px;
-    border-bottom: 3px solid $primary-low; 
-  }
+
   #revisions {
     word-wrap: break-word;
     table {
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 3e7e61efcc4..b7ce599cb8e 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -12,21 +12,8 @@
   margin-bottom: 20px;
 }
 
-#login-form {
-  a {
-    color: dark-light-choose($primary-high, $secondary-low);
-  }
-  td {
-    padding-right: 5px;
-  }
-}
-
 // Create account
 
-#new-account-link {
-  cursor: pointer;
-}
-
 .create-account {
   form {
     margin-bottom: 0;
diff --git a/app/assets/stylesheets/desktop/menu-panel.scss b/app/assets/stylesheets/desktop/menu-panel.scss
deleted file mode 100644
index 74266de4cf0..00000000000
--- a/app/assets/stylesheets/desktop/menu-panel.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.docked #hamburger-menu {
-  position: fixed;
-}
-
-#hamburger-menu {
-  position: absolute;
-  top: 63px;
-  // compensate on the other end for this top
-  .hamburger-body {
-    bottom: 100px;
-  }
-}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index e49ae388132..2a0fbf8d982 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -22,8 +22,6 @@
 }
 
 .modal-body {
-  overflow-y: auto;
-  max-height: 400px;
   padding: 15px;
 }
 
@@ -69,23 +67,6 @@
   }
 }
 
-.flag-modal {
-  max-height: 450px;
-  .flag-action-type-details {
-    line-height: $line-height-large;
-  }
-}
-
-.custom-message-length {
-  color: dark-light-choose($primary-low-mid, $secondary-high);
-  font-size: $font-down-1;
-}
-
-.flag-message {
-  width: 95%;
-  margin: 0;
-}
-
 .edit-category-modal {
   .modal-body {
     position: relative;
@@ -93,22 +74,6 @@
     max-height: 420px;
     padding-bottom: 0;
   }
-  .secure-category-options {
-    margin: 10px 0 0 16px;
-    .badge-list {
-      margin: 10px 0;
-      li {
-        margin: 0 4px 8px 0;
-        a {
-          color: dark-light-choose($primary-medium, $secondary-medium);
-          cursor: pointer;
-        }
-        a:hover {
-          color: dark-light-choose($primary-medium, $secondary-medium);
-        }
-      }
-    }
-  }
 
   .disable_info_wrap {
     margin-top: -70px;
@@ -147,18 +112,6 @@
       max-width: 23%;
     }
   }
-
-}
-.tabbed-modal {
-  .modal-body {
-    position: relative;
-    height: 350px;
-  }
-}
-
-.modal-tab {
-  position: absolute;
-  width: 95%;
 }
 
 .split-modal {
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 08abaaf2ae8..66c13c4f5c0 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -18,7 +18,6 @@
 @import "mobile/user";
 @import "mobile/history";
 @import "mobile/directory";
-@import "mobile/menu-panel";
 @import "mobile/search";
 @import "mobile/emoji";
 @import "mobile/ring";
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 472345a79ee..15fdb951658 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,36 +1,18 @@
-.user-controls {
-  padding: 1em;
-}
-
-.total-rows {
-  padding: 0.25em 0.5em;
-}
-
 .directory .user {
   border-top: 1px solid $primary-low;
   padding: 1em;
 
-
-  &.me {
-    background-color: dark-light-choose($highlight-low, $highlight-medium);
-
-    .username a, .name, .title, .number, .time-read, .user-stat .label {
-      color: scale-color($highlight, $lightness: -50%);
-    }
-  }
   .user-stat {
     margin-left: 55px;
-
     .value {
       font-weight: bold;
     }
     .label {
       margin-left: 0.2em;
-      color: blend-primary-secondary(50%);
+      color: $primary-medium;
     }
     .d-icon-heart {
       color: $love;
     }
   }
-  margin-bottom: 1em;
 }
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 34d67e4c019..3bd4ef1ae0b 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -1,6 +1,4 @@
 .emoji-picker {
-  box-shadow: none;
   height: 250px;
-  border-radius: 0;
   border: none;
 }
diff --git a/app/assets/stylesheets/mobile/faqs.scss b/app/assets/stylesheets/mobile/faqs.scss
index 4fdfda90bab..4e34e9b2cf2 100644
--- a/app/assets/stylesheets/mobile/faqs.scss
+++ b/app/assets/stylesheets/mobile/faqs.scss
@@ -4,7 +4,6 @@
 
 .body-page {
   margin-top: 20px;
-  margin-left: 15px;
-  width: 90%;
+  width: 100%;
   padding-left: 0;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 93a2a29e7e4..bae7149be0e 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -8,11 +8,6 @@
   #revision-numbers {
     line-height: $line-height-large;
   }
-  #revision-details {
-    background-color: $primary-low; 
-    padding: 5px;
-    margin-top: 10px;
-  }
   img {
     max-width: 95%;
     height: auto;
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 53d8e7b41a8..e7b346f9ac7 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -15,9 +15,7 @@
 }
 
 #login-form {
-  a {
-    color: dark-light-choose($primary-high, $secondary-low);
-  }
+ 
   label { float: left; display: block; }
   textarea, input, select {
     font-size: $font-up-1;
@@ -31,12 +29,6 @@ a#new-account-link { white-space:nowrap; }
 
 // Create account
 
-#new-account-link {
-  cursor: pointer;
-}
-
-a#forgot-password-link {clear: left; float: left; }
-
 .login-modal, .create-account {
   .btn-primary {
     margin-bottom: 10px;
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
deleted file mode 100644
index 972ea30ab2a..00000000000
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.menu-panel {
-  span.badge-category {
-    max-width: 85px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 7469f8876cd..7d2e19e7b3a 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -22,8 +22,6 @@
   top: 50%;
 }
 .modal-body {
-  overflow-y: auto;
-  max-height: 400px;
   padding: 10px;
 }
 
@@ -70,27 +68,12 @@
   }
 }
 
-.flag-modal {
-  max-height: 450px;
-}
-
 @media only screen and (max-device-width: 568px) {
   .modal .flag-modal .flag-message {
-    height: 1.2em;
+    height: 3em;
   }
 }
 
-.custom-message-length {
-  margin: -4px 0 10px 20px;
-  color: dark-light-choose($primary-high, $secondary-low);
-  font-size: $font-down-1;
-}
-
-.flag-message {
-  margin-left: 20px;
-  width: 95% !important;
-}
-
 .edit-category-modal {
   .modal-body {
     box-sizing: border-box;
@@ -100,19 +83,6 @@
   &.small .modal-body {
     height: 310px;
   }
-  .secure-category-options {
-    margin: 10px 0 0 16px;
-    .badge-list {
-      margin: 10px 0;
-      li {
-        margin: 0 4px 8px 0;
-        a {
-          color: #888;
-          cursor: pointer;
-        }
-      }
-    }
-  }
 
   .disable_info_wrap .cannot_delete_reason {
     top: -114px;
@@ -121,18 +91,6 @@
   }
 }
 
-.tabbed-modal {
-  .modal-body {
-    position: relative;
-    height: 350px;
-  }
-}
-
-
-.modal-tab {
-  position: absolute;
-}
-
 /* fixes for the new account confirm dialog on mobile */
 
 .modal-inner-container {