Merge branch 'master' into gh-pages

6 files changed, 61 insertions, 51 deletions

diff --git a/src/buttons.less b/src/buttons.less
index 0c2a7f3..5fd5c80 100644
--- a/src/buttons.less
+++ b/src/buttons.less
@@ -31,29 +31,6 @@
     background-color: darken(@core-color, 5%);
   }
 
-  &.loading {
-    color: transparent !important;
-    position: relative;
-    pointer-events: none;
-
-    &::after {
-      border: .2rem solid @core-color;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      border-radius: .8rem;
-      content: "";
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      margin-left: -.8rem;
-      margin-top: -.8rem;
-      display: block;
-      width: 1.6rem;
-      height: 1.6rem;
-      animation: loading 500ms infinite linear;
-    }
-  }
-
   &[disabled],
   .disabled {
     opacity: .5;
diff --git a/src/labels.less b/src/labels.less
index aba7cf4..f08f5bc 100644
--- a/src/labels.less
+++ b/src/labels.less
@@ -13,23 +13,18 @@
   border-radius: .2rem;
 
   &.label-primary {
-    color: #fff;
-    background-color: @core-color;
+    .toast-variant(@core-color);
   }
   &.label-success {
-    color: #fff;
-    background-color: @control-color-success;
+    .toast-variant(@control-color-success);
   }
   &.label-info {
-    color: #fff;
-    background-color: @control-color-info;
+    .toast-variant(@control-color-info);
   }
   &.label-warning {
-    color: #fff;
-    background-color: @control-color-warning;
+    .toast-variant(@control-color-warning);
   }
   &.label-danger {
-    color: #fff;
-    background-color: @control-color-danger;
+    .toast-variant(@control-color-danger);
   }
 }
\ No newline at end of file
diff --git a/src/navigation.less b/src/navigation.less
index 9b828ff..f823210 100644
--- a/src/navigation.less
+++ b/src/navigation.less
@@ -77,3 +77,5 @@
     }
   }
 }
+// TODO: Pagination
+
diff --git a/src/toasts.less b/src/toasts.less
index 44becf1..fe6081a 100644
--- a/src/toasts.less
+++ b/src/toasts.less
@@ -9,31 +9,32 @@
   background-color: @core-border-color;
 
   &.toast-primary {
-    color: #fff;
-    background-color: @core-color;
-    border-color: darken(@core-color, 2%);
+    .toast-variant(@core-color);
   }
-
   &.toast-success {
-    color: #fff;
-    background-color: @control-color-success;
-    border-color: darken(@control-color-success, 2%);
+    .toast-variant(@control-color-success);
   }
   &.toast-info {
-    color: #fff;
-    background-color: @control-color-info;
-    border-color: darken(@control-color-info, 2%);
+    .toast-variant(@control-color-info);
   }
   &.toast-warning {
-    color: #fff;
-    background-color: @control-color-warning;
-    border-color: darken(@control-color-warning, 2%);
+    .toast-variant(@control-color-warning);
   }
   &.toast-danger {
-    color: #fff;
-    background-color: @control-color-danger;
-    border-color: darken(@control-color-danger, 2%);
+    .toast-variant(@control-color-danger);
   }
-}
 
-// TODO: attached toasts
\ No newline at end of file
+  &:first-child:not(:last-child) {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+    margin-top: -.1rem;
+  }
+  &:last-child:not(:first-child) {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    margin-top: -.1rem;
+  }
+}
\ No newline at end of file
diff --git a/src/utilities.less b/src/utilities.less
index ded95e7..a088eb0 100644
--- a/src/utilities.less
+++ b/src/utilities.less
@@ -160,6 +160,31 @@
   border-radius: 50%;
 }
 
+// Loading
+.loading {
+  min-height: 1.6rem;
+  color: transparent !important;
+  position: relative;
+  pointer-events: none;
+
+  &::after {
+    border: .2rem solid @core-color;
+    border-right-color: transparent;
+    border-top-color: transparent;
+    border-radius: .8rem;
+    content: "";
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -.8rem;
+    margin-top: -.8rem;
+    display: block;
+    width: 1.6rem;
+    height: 1.6rem;
+    animation: loading 500ms infinite linear;
+  }
+}
+
 // Animations
 @keyframes loading {
   0%{transform: rotate(0deg);}
diff --git a/src/variables.less b/src/variables.less
index 14882ae..cd8d0ef 100644
--- a/src/variables.less
+++ b/src/variables.less
@@ -24,4 +24,14 @@
     display: table;
     clear: both;
   }
+}
+
+.toast-variant(@color) {
+  color: #fff;
+  background-color: @color;
+  border-color: darken(@color, 2%);
+}
+.label-variant(@color) {
+  color: #fff;
+  background-color: @color;
 }
\ No newline at end of file