Merge mastodon#6313

yi0713 · Jan 21, 2018 · 8c26f22 · 8c26f22
1 parent 62f296f
commit 8c26f22
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/app/javascript/styles/white/components.scss b/app/javascript/styles/white/components.scss
@@ -2070,6 +2070,17 @@
   margin-right: 5px;
 }
 
+.column-link__badge {
+  display: inline-block;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 19px;
+  font-weight: 500;
+  background: $ui-base-color;
+  padding: 4px 8px;
+  margin: -6px 10px;
+}
+
 .column-subheading {
   background: $ui-base-color;
   color: $ui-base-lighter-color;