From 1360349156d5a21c542fcc925f45d0ececeadaf4 Mon Sep 17 00:00:00 2001
From: Sam Lanning <sam@samlanning.com>
Date: Fri, 22 Jan 2016 00:02:29 +0000
Subject: [PATCH] Consolidate .message-list styling

There was some lone .message-list styling that i've brought up to the logical
place in the stylesheet.

// FREEBIE
---
 stylesheets/_conversation.scss | 45 +++++++++++++++-------------------
 stylesheets/manifest.css       | 33 ++++++++++++-------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 5459a543..3746dbd7 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -40,10 +40,30 @@
         top: 0;
         height: 100%;
         width: 100%;
+        margin: 0;
+        padding: 2em 8px 0;
+        overflow-y: auto;
 
         @media(min-width: $big-avatar-min-width) {
           padding-left: 70px;
         }
+
+        &:before {
+          display: block;
+          margin: -25px auto 10px;
+          content: " ";
+          height: $loading-height;
+          width: $loading-height;
+          border: solid 3px transparent;
+        }
+
+        .timestamp {
+          cursor: pointer;
+
+          &:hover {
+            text-decoration: underline;
+          }
+        }
       }
     }
   }
@@ -240,31 +260,6 @@
   }
 }
 
-.message-list {
-  position: relative;
-  margin: 0;
-  padding: 2em 0 0;
-  overflow-y: auto;
-
-  &:before {
-    display: block;
-    margin: -25px auto 10px;
-    content: " ";
-    height: $loading-height;
-    width: $loading-height;
-    border: solid 3px transparent;
-  }
-
-  .timestamp {
-    cursor: pointer;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-
-}
-
 .message-detail,
 .message-list {
   list-style: none;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index e39b11ba..1b1a5e03 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -614,10 +614,24 @@ input.search {
         position: absolute;
         top: 0;
         height: 100%;
-        width: 100%; }
+        width: 100%;
+        margin: 0;
+        padding: 2em 8px 0;
+        overflow-y: auto; }
         @media (min-width: 900px) {
           .conversation .panel .discussion-container .message-list {
             padding-left: 70px; } }
+        .conversation .panel .discussion-container .message-list:before {
+          display: block;
+          margin: -25px auto 10px;
+          content: " ";
+          height: 16px;
+          width: 16px;
+          border: solid 3px transparent; }
+        .conversation .panel .discussion-container .message-list .timestamp {
+          cursor: pointer; }
+          .conversation .panel .discussion-container .message-list .timestamp:hover {
+            text-decoration: underline; }
 
 .group-member-list,
 .new-group-update,
@@ -754,23 +768,6 @@ input.search {
   .outgoing.entry.pending .status:before {
     content: '...'; }
 
-.message-list {
-  position: relative;
-  margin: 0;
-  padding: 2em 0 0;
-  overflow-y: auto; }
-  .message-list:before {
-    display: block;
-    margin: -25px auto 10px;
-    content: " ";
-    height: 16px;
-    width: 16px;
-    border: solid 3px transparent; }
-  .message-list .timestamp {
-    cursor: pointer; }
-    .message-list .timestamp:hover {
-      text-decoration: underline; }
-
 .message-detail,
 .message-list {
   list-style: none; }