From 8301c9dad289bab61a4f18ad1cdb1cbc9a7b1d80 Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Tue, 18 Aug 2020 11:28:56 -0700
Subject: [PATCH] _sass: Fold %card-meta into %card .label
---
_sass/custom/announcement.scss | 5 -----
_sass/custom/card.scss | 10 +++++-----
_sass/custom/custom.scss | 3 ++-
_sass/custom/module.scss | 5 -----
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss
index 792c9d3..105f194 100644
--- a/_sass/custom/announcement.scss
+++ b/_sass/custom/announcement.scss
@@ -4,9 +4,4 @@
h1, h2 {
@extend .text-gamma;
}
-
- .label {
- @extend %card-meta;
- margin-left: 0;
- }
}
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index 0f6edf5..eea5bc8 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -29,10 +29,10 @@
margin-top: 0;
margin-bottom: 0.5em;
}
-}
-%card-meta {
- border-radius: $border-radius;
- padding-bottom: 0;
- user-select: none;
+ .label {
+ border-radius: $border-radius;
+ margin-left: 0;
+ user-select: none;
+ }
}
diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index a0f266f..c16b847 100644
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -26,9 +26,10 @@ div.highlighter-rouge[overlay] {
position: relative;
&::after {
- @extend .label, %card-meta, .text-grey-dk-100;
+ @extend .label, .text-grey-dk-100;
background-color: $white;
+ border-radius: $border-radius;
bottom: $sp-2;
content: attr(overlay);
position: absolute;
diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss
index 572e281..fcb7b0e 100644
--- a/_sass/custom/module.scss
+++ b/_sass/custom/module.scss
@@ -6,11 +6,6 @@
@extend .text-gamma;
}
- .label {
- @extend %card-meta;
- margin-left: 0;
- }
-
>dl {
border-bottom: $border $border-color;
border-top: $border $border-color;
--
GitLab