From cc814f4d768b8cf7abc6146e73ac5958aa839f68 Mon Sep 17 00:00:00 2001 From: Leslie Hoare Date: Thu, 26 Nov 2015 13:21:07 +0000 Subject: [PATCH 1/3] Create a mixin for creating new card styles. I'm aware that currently cards are a lot simpler than buttons right now but this may change in future and it feels cleaner to be able to create new card styles without needing to know the internals of how they're implemented. --- scss/_mixins.scss | 1 + scss/mixins/_cards.scss | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 scss/mixins/_cards.scss diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 90a48cf89e..75a4c92933 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -38,6 +38,7 @@ // // Components @import "mixins/alert"; @import "mixins/buttons"; +@import "mixins/cards"; @import "mixins/pagination"; @import "mixins/list-group"; @import "mixins/nav-divider"; diff --git a/scss/mixins/_cards.scss b/scss/mixins/_cards.scss new file mode 100644 index 0000000000..83ff839c5a --- /dev/null +++ b/scss/mixins/_cards.scss @@ -0,0 +1,6 @@ +// Card variants + +@mixin card-variant($color) { + background-color: $color; + border-color: $color; +} From beb11714dd16f5f8959f6f962d07a8b00141f372 Mon Sep 17 00:00:00 2001 From: Leslie Hoare Date: Thu, 26 Nov 2015 13:26:40 +0000 Subject: [PATCH 2/3] Use the new mixin. --- scss/_card.scss | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index aff6036a08..35a5e7c22c 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -92,27 +92,21 @@ // .card-primary { - background-color: $brand-primary; - border-color: $brand-primary; + @include card-variant($brand-primary); } .card-success { - background-color: $brand-success; - border-color: $brand-success; + @include card-variant($brand-success); } .card-info { - background-color: $brand-info; - border-color: $brand-info; + @include card-variant($brand-info); } .card-warning { - background-color: $brand-warning; - border-color: $brand-warning; + @include card-variant($brand-warning); } .card-danger { - background-color: $brand-danger; - border-color: $brand-danger; + @include card-variant($brand-danger); } - // // Inverse text within a card for use with dark backgrounds // From c050d1e2e415d3639911bd537a7c8b65825bedd8 Mon Sep 17 00:00:00 2001 From: Leslie Date: Thu, 26 Nov 2015 13:33:54 +0000 Subject: [PATCH 3/3] Update _cards.scss --- scss/mixins/_cards.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/mixins/_cards.scss b/scss/mixins/_cards.scss index 83ff839c5a..9541c67d4c 100644 --- a/scss/mixins/_cards.scss +++ b/scss/mixins/_cards.scss @@ -1,6 +1,6 @@ // Card variants @mixin card-variant($color) { - background-color: $color; - border-color: $color; + background-color: $color; + border-color: $color; }