From d3dae9f2ae2d491256b340cae9b06d0b66654d3e Mon Sep 17 00:00:00 2001 From: Kevin Lin <kevinl@cs.uw.edu> Date: Tue, 30 Jun 2020 11:46:35 -0700 Subject: [PATCH] _sass: .card -> %card placeholder selector --- _sass/custom/announcement.scss | 6 +++--- _sass/custom/card.scss | 11 ++++++----- _sass/custom/module.scss | 10 +++++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss index 4c3aeec..a1f6804 100644 --- a/_sass/custom/announcement.scss +++ b/_sass/custom/announcement.scss @@ -1,9 +1,9 @@ .announcement { - @extend .card; + @extend %card; } .announcement-body { - @extend .card-body; + @extend %card-body; h1, h2, h3, h4, h5, h6 { display: flex; @@ -12,5 +12,5 @@ } .announcement-meta { - @extend .card-meta, .text-grey-dk-100, .bg-grey-lt-200; + @extend %card-meta, .text-grey-dk-100, .bg-grey-lt-200; } diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss index 35e7c29..423b4ac 100644 --- a/_sass/custom/card.scss +++ b/_sass/custom/card.scss @@ -1,4 +1,4 @@ -.card { +%card { @include abstract-card(); display: flex; flex-direction: column; @@ -11,8 +11,7 @@ } } -.card-header, -.card-body { +%card-header { padding: $sp-2 $sp-4; p { @@ -20,11 +19,13 @@ } } -.card-body { +%card-body { + @extend %card-header; + flex: 1 1 auto; } -.card-meta { +%card-meta { @extend .label; border-radius: $border-radius; padding-bottom: 0; diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss index 1f57c4a..581c540 100644 --- a/_sass/custom/module.scss +++ b/_sass/custom/module.scss @@ -1,5 +1,5 @@ .module { - @extend .card; + @extend %card; .module-days { display: grid; @@ -60,7 +60,7 @@ } .label { - @extend .card-meta; + @extend %card-meta; margin-left: 0; &.label-hw-out { @@ -79,13 +79,13 @@ } .module-meta { - @extend .card-meta, .text-grey-dk-100, .bg-grey-lt-200; + @extend %card-meta, .text-grey-dk-100, .bg-grey-lt-200; } .module-header { - @extend .card-header; + @extend %card-header; } .module-body { - @extend .card-body; + @extend %card-body; } -- GitLab