From c11965ed9f52e4ca962131ab56e7b45df65c96fe Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Wed, 19 Mar 2014 09:38:35 -0400
Subject: [PATCH] removing border from topic list, making category sizes
 consistent

---
 .../stylesheets/common/components/badges.css.scss   | 10 +++-------
 app/assets/stylesheets/desktop/topic-list.scss      | 13 ++++++-------
 app/assets/stylesheets/desktop/topic-post.scss      |  3 ++-
 app/assets/stylesheets/desktop/topic.scss           |  4 ++--
 app/assets/stylesheets/mobile/header.scss           |  5 ++---
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 0a3d80d230d..a989ec74df5 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -19,21 +19,17 @@
 // --------------------------------------------------
 
 .badge-category {
-  padding: 2px 6px;
+  padding: 6px;
   color: $tertiary_text_color;
   font-size: 12px;
   font-weight: bold;
   white-space: nowrap;
   display: inline-block;
+  line-height: 1;
   &[href] {
   color: $tertiary_text_color;
   }
-  &.restricted {
-    div {
-      display: inline-block;
-      margin: 0;
-    }
-  }
+
 }
 
 .d-dropdown .badge-category {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 9448ffadb95..820c7cba7a9 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -11,7 +11,7 @@
 .list-controls {
   .nav {
     float: left;
-    margin-bottom: 22px;
+    margin-bottom: 18px;
   }
 
   .btn {
@@ -62,7 +62,6 @@
   border-collapse: separate;
   border-spacing: 0;
   margin: 0 0 10px;
-  border: 1px solid $primary_border_color;
   a.title {color: $primary_text_color;}
   a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);}
 
@@ -432,6 +431,8 @@
 // --------------------------------------------------
 
 .list-controls {
+  border-bottom: 1px solid $primary_border_color;
+
   .home {
     background-color: lighten($secondary_background_color, 76%);
     color: $primary_text_color;
@@ -530,17 +531,15 @@ ol.category-breadcrumb {
     text-transform: none;
     width: 100%;
     min-width: 102px;
-
     text-align: center;
     margin-right: 20px;
+    margin-bottom: 7px;
   }
 
-
-  div {
-    margin-bottom: 10px;
-  }
 }
 
+.top-lists {margin-top: 20px;}
+
 #bulk-select {
   position: fixed;
   right: 20px;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index df196fd30fe..20ae06006c6 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -471,13 +471,14 @@ iframe {
   a.star {
     margin-right: 8px;
     font-size: 20px;
-    margin-top: 8px;
+    margin-top: 6px;
   }
 
   .topic-statuses {margin-top: -2px;}
 
   .badge-category {
     vertical-align: top;
+    margin-top: 4px;
   }
 
 }
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 3618f70a8e0..6a430ac2dd0 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -41,7 +41,7 @@
   .star {
     font-size: 20px;
     margin-top: 8px;
-    margin-right: 8px;
+    margin-right: 6px;
   }
   #edit-title { width: 500px; }
   .category-combobox {
@@ -59,7 +59,7 @@
     margin: 0;
     line-height: 1.2em;
     overflow: hidden;
-    a.badge-category { vertical-align: top; }
+    a.badge-category { vertical-align: top; margin-top: 4px; }
     a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
   }
   .topic-statuses {
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 419daf253ce..43e1819af68 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -34,8 +34,8 @@
     }
   }
   #site-logo {
-  max-width: 122px;
-  max-height: 40px;
+    max-width: 122px;
+    max-height: 40px;
   }
   .fa-home {
     font-size: 20px;
@@ -235,7 +235,6 @@
   .category {
     float: left;
     background-color: transparent;
-    line-height: 20px;
   }
 
   &#user-dropdown {