Merge pull request #3376 from awesomerobot/master

some fixes for tag alignment

app/assets/stylesheets/common/base/topic.scss

@@ -6,6 +6,13 @@
     .btn-small {
       margin: 0 6px 0 0;
     }
+
+    .badge-wrapper {
+      float: left;
+      &.bullet {
+        margin-top: 5px;
+      }
+    }
   }
 
   a.badge-category {
@@ -24,3 +31,13 @@
     top: 0;
   }
 }
+
+.extra-info-wrapper {
+  .badge-wrapper {
+    float: left;
+    &.bullet {
+      margin-top: 5px;
+    }
+  }
+
+}

app/assets/stylesheets/common/components/badges.css.scss

@@ -24,6 +24,8 @@
 
   &.bar { //bar category style
     line-height: 1.25;
+    margin-right: 5px;
+    
     span.badge-category {
       color: $primary !important;
       padding: 3px;
@@ -51,7 +53,7 @@
 
   &.bullet { //bullet category style
     line-height: 1;
-    margin-right: 5px;
+    margin-right: 10px;
 
     h3 & {
       line-height: .9;
@@ -98,6 +100,7 @@
   &.box {  //box category style (apply custom widths to the wrapper, not the children)
     line-height: 1.5;
     margin-top: 5px;
+    margin-right: 5px;
 
     span {
       display: block;

app/assets/stylesheets/mobile/topic.scss

@@ -19,7 +19,7 @@
   h1 {
     font-size: 1.5em;
     line-height: 1.25em;
-    margin:0;
+    margin: 0;
     a {
       color: $primary;
       vertical-align: middle;