Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

1 files changed, 21 insertions, 0 deletions

diff --git a/library/font_awesome/src/assets/less/site/bootstrap/labels.less b/library/font_awesome/src/assets/less/site/bootstrap/labels.less
new file mode 100644
index 000000000..d0d12dcf8
--- /dev/null
+++ b/library/font_awesome/src/assets/less/site/bootstrap/labels.less
@@ -0,0 +1,21 @@
+// reset
+.label {
+  padding: .3em .6em;
+}
+
+// new types of labels
+.label-brand {
+  .label-variant(@label-brand-bg);
+}
+
+.label-dark {
+  .label-variant(@label-dark-bg);
+}
+
+// labels inside of headings
+h1, h2, h3, h4, h5, h6 {
+
+  .label {
+    font-family: @font-family-sans-serif;
+  }
+}