From 4380402cd703c3c0b0b3a8ea241356068fceafe5 Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Sat, 4 Jul 2020 15:42:10 -0700
Subject: [PATCH] Consistent announcement and module style
---
_layouts/announcement.html | 2 +-
_layouts/module.html | 2 +-
_sass/custom/announcement.scss | 4 ++++
_sass/custom/card.scss | 5 +++++
_sass/custom/module.scss | 9 +++++++++
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/_layouts/announcement.html b/_layouts/announcement.html
index bd91b0a..d20bd20 100644
--- a/_layouts/announcement.html
+++ b/_layouts/announcement.html
@@ -1,6 +1,6 @@
<div class="announcement">
+ <h2 class="announcement-header">{% if page.date %}<strong class="announcement-meta">{{ page.date | date: '%b %e' }}</strong> {% endif %}{{ page.title }}</h2>
<div class="announcement-body">
- <h2>{{ page.title }}{% if page.date %} <strong class="announcement-meta">{{ page.date | date: '%b %e' }}</strong>{% endif %}</h2>
{{ content }}
</div>
</div>
diff --git a/_layouts/module.html b/_layouts/module.html
index 6e21f32..0e71221 100644
--- a/_layouts/module.html
+++ b/_layouts/module.html
@@ -1,5 +1,5 @@
<div class="module">
- <h3 class="module-header"><strong class="module-meta">{{ page.week }}</strong> {{ page.title }}</h3>
+ <h2 class="module-header">{% if page.week %}<strong class="module-meta">Week {{ page.week }}</strong> {% endif %}{{ page.title }}</h2>
{% if page.days %}
<dl class="module-days">
{% for day in page.days %}
diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss
index a1f6804..ce5fd9f 100644
--- a/_sass/custom/announcement.scss
+++ b/_sass/custom/announcement.scss
@@ -2,6 +2,10 @@
@extend %card;
}
+.announcement-header {
+ @extend %card-header;
+}
+
.announcement-body {
@extend %card-body;
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index bfe59a5..3466222 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -19,6 +19,10 @@
@include mq(lg) {
flex: 1 0 0%;
}
+
+ >:first-child {
+ border-top: none;
+ }
}
%card-header {
@@ -33,6 +37,7 @@
@extend %card-header;
flex: 1 1 auto;
+ border-top: $border $border-color;
}
%card-meta {
diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss
index 581c540..e853cef 100644
--- a/_sass/custom/module.scss
+++ b/_sass/custom/module.scss
@@ -2,6 +2,7 @@
@extend %card;
.module-days {
+ border-top: $border $border-color;
display: grid;
grid-template-columns: max-content 1fr;
margin: 0;
@@ -45,6 +46,14 @@
border-top: $border $border-color;
}
+ &:first-child {
+ border-top: none;
+
+ +.module-event {
+ border-top: none;
+ }
+ }
+
&::after {
content: ":";
}
--
GitLab