merge tootsuite pr #6313 into glitch

2018-01-22 19:05:13 -06:00
parent 2c578a01d8
commit 00be9eb3fe
3 changed files with 65 additions and 17 deletions
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -737,6 +737,17 @@
  }
 }

+.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;
+}
+
 .keyboard-shortcuts {
  padding: 8px 0 0;
  overflow: hidden;