From 32116654ec1367d21ad117a0d72ee7b1f233bdf2 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 12 Feb 2018 15:16:27 -0500
Subject: [PATCH] removing duplicate topic-map desktop/mobile styles

---
 .../stylesheets/common/base/topic-post.scss   | 40 ++++++++++++++++++-
 .../stylesheets/desktop/topic-post.scss       | 38 ------------------
 app/assets/stylesheets/mobile/topic-post.scss | 36 +----------------
 3 files changed, 40 insertions(+), 74 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index b2c9f640a6d..9614af03bc4 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -199,7 +199,10 @@ aside.quote {
 }
 
 .topic-map {
-
+  background: blend-primary-secondary(5%);
+  border: 1px solid $primary-low;
+  border-top: none; // would cause double top border
+  
   .avatars {
     > div {
       float: left;
@@ -223,6 +226,41 @@ aside.quote {
     margin-right: 4px;
   }
 
+  section {
+    border-top: 1px solid $primary-low;
+  }
+
+  ul {
+    margin: 0;
+    list-style: none;
+  }
+
+  h3 {
+    margin-bottom: 4px;
+    color: dark-light-choose($primary-high, $secondary-low);
+    line-height: $line-height-large;
+    font-weight: normal;
+    font-size: $font-0;
+  }
+
+  h4 {
+    margin: 1px 0 2px 0;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-weight: normal;
+    font-size: $font-down-1;
+    line-height: $line-height-small;
+  }
+
+  span.domain {
+    font-size: $font-down-2;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+
+  td {
+    vertical-align: top;
+    padding:1px;
+  }
+
 }
 
 .topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 49fb1f8491c..dd652652031 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -307,39 +307,6 @@ nav.post-controls {
 
 .topic-map {
   margin: 20px 0;
-  background: blend-primary-secondary(5%);
-  border: 1px solid $primary-low;
-  border-top: none; // would cause double top border
-
-  section {
-    border-top: 1px solid $primary-low;
-  }
-
-  h3 {
-    margin-bottom: 4px;
-    color: dark-light-choose($primary-high, $secondary-low);
-    line-height: $line-height-large;
-    font-weight: normal;
-    font-size: $font-0;
-  }
-
-  h4 {
-    margin: 1px 0 2px 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    font-weight: normal;
-    font-size: $font-down-1;
-    line-height: $line-height-small;
-  }
-
-  ul {
-    margin: 0;
-    list-style: none;
-  }
-
-  span.domain {
-    font-size: $font-down-2;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
 
   .map {
     .secondary {text-align: center;}
@@ -391,11 +358,6 @@ nav.post-controls {
     }
   }
 
-  td {
-    vertical-align: top;
-    padding:1px;
-  }
-
   .buttons {
     float: right;
     .btn {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 768a59bf810..3b48e5c91ec 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -143,30 +143,10 @@ a.reply-to-tab {
 }
 
 .topic-map {
-
   margin: 10px 0;
-  background: blend-primary-secondary(5%);
-  border: 1px solid $primary-low;
-  border-top: none; // would cause double top border
-
-  section {
-    border-top: 1px solid $primary-low;
-  }
-
-  h3 {
-    margin-bottom: 4px;
-    margin-top: 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    line-height: $line-height-large;
-    font-weight: normal;
-    font-size: $font-0;
-  }
 
   h4 {
     margin: 0 0 3px 0;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    font-weight: normal;
-    font-size: $font-down-1;
     line-height: $line-height-medium;
   }
 
@@ -175,11 +155,6 @@ a.reply-to-tab {
     margin-right: 10px;
   }
 
-  ul {
-    margin: 0;
-    list-style: none;
-  }
-
   .map-collapsed {
     .secondary {
       display: none;
@@ -195,7 +170,7 @@ a.reply-to-tab {
       }
     }
     a, .number {
-      line-height: $line-height-large;
+      line-height: $line-height-medium;
     }
     .number, i {
       color: dark-light-choose($primary-high, $secondary-low);
@@ -226,21 +201,12 @@ a.reply-to-tab {
     .user {float: left; margin: 0 10px 10px 0;}
   }
 
-  .domain {
-    color: dark-light-choose($primary-low-mid, $secondary-high);
-  }
-
   .topic-links {
     .badge-notification {
       margin: 1px 5px 2px 0;
     }
   }
 
-  td {
-    vertical-align: top;
-    padding:1px;
-  }
-
   .buttons {
     .btn {
       border: 0;