From 5c1360ed61e941d881720cbac8d86b442a77a941 Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Mon, 10 Aug 2020 19:45:01 -0700
Subject: [PATCH] Simplify announcement sass and card layout
---
_layouts/announcement.html | 8 +++-----
_sass/custom/announcement.scss | 16 +++++++---------
_sass/custom/card.scss | 9 +++++----
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/_layouts/announcement.html b/_layouts/announcement.html
index 00fd50b..b454677 100644
--- a/_layouts/announcement.html
+++ b/_layouts/announcement.html
@@ -1,11 +1,9 @@
<div class="announcement">
- <h2 class="announcement-header">
+ <h2>
{% if page.date %}
- <strong class="announcement-meta">{{ page.date | date: '%b %e' }}</strong>
+ <strong class="label label-purple">{{ page.date | date: '%b %e' }}</strong>
{% endif %}
{{ page.title }}
</h2>
- <div class="announcement-body">
- {{ content }}
- </div>
+ {{ content }}
</div>
diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss
index 69fa578..792c9d3 100644
--- a/_sass/custom/announcement.scss
+++ b/_sass/custom/announcement.scss
@@ -1,14 +1,12 @@
.announcement {
@extend %card;
-}
-
-.announcement-header {
- @extend .text-gamma;
-}
-.announcement-body {
-}
+ h1, h2 {
+ @extend .text-gamma;
+ }
-.announcement-meta {
- @extend %card-meta, .text-grey-dk-100, .bg-grey-lt-200;
+ .label {
+ @extend %card-meta;
+ margin-left: 0;
+ }
}
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index f20c3bf..0f6edf5 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -17,10 +17,6 @@
position: relative;
word-wrap: break-word;
- @include mq(lg) {
- flex: 1 0 0%;
- }
-
>:first-child {
border-top: none !important;
}
@@ -28,6 +24,11 @@
>:last-child {
border-bottom: none !important;
}
+
+ p {
+ margin-top: 0;
+ margin-bottom: 0.5em;
+ }
}
%card-meta {
--
GitLab