Carousel component: solved conflicts merging master

2016-02-09 18:14:53 +01:00
parent bddf751f04 50d67db30b
commit 43efadb59c
27 changed files with 88 additions and 71 deletions
@@ -2,6 +2,7 @@
 // ----------------------------------------------

@import './mixins';
+@import '../cdb-variables/colors';

 /* Margins */
 .u-tSpace {
@@ -41,6 +42,23 @@
  margin-left: 12px;
 }

+// Colors
+// Main Text Color is default color 
+// ----------------------------------------------
+
+.u-mainTextColor {
+  color: $cMainText;
+}
+.u-secondaryTextColor {
+  color: $cSecondaryText;
+}
+.u-altTextColor {
+  color: $cAltText;
+}
+.u-hintTextColor {
+  color: $cHintText;
+}
+
 /* Displays */
 .u-iBlock {
  @include inline-block();