From fd779072dd1c4fdbf061db362984b17e40acc297 Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Fri, 26 Jun 2020 14:07:19 -0700
Subject: [PATCH] _sass: Merge overrides.scss into custom.scss

---
 _sass/custom/custom.scss | 94 ++++++++++++++++++++++++++++++++++++++++
 _sass/overrides.scss     | 92 ---------------------------------------
 2 files changed, 94 insertions(+), 92 deletions(-)
 delete mode 100644 _sass/overrides.scss

diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 08c4fb5..63708ae 100644
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -7,3 +7,97 @@
 @import 'module';
 @import 'schedule';
 @import 'staffer';
+
+// Overrides
+a abbr[title] {
+  border-bottom: none;
+}
+
+abbr[title] {
+  text-decoration: none;
+}
+
+code {
+  font-size: 14px;
+  padding: 0.2em 0.4em;
+  border: none;
+}
+
+details {
+  margin-left: 40px;
+  margin-right: 40px;
+}
+
+iframe,
+summary {
+  max-width: 100%;
+}
+
+summary {
+  @extend .btn, .btn-outline;
+  margin-bottom: 1em;
+}
+
+.main-content-wrap {
+  max-width: $content-width;
+  margin: auto;
+}
+
+.main-content {
+  a {
+    white-space: normal;
+  }
+
+  dl {
+    display: block;
+    grid-template-columns: none;
+  }
+
+  dt {
+    font-weight: 700;
+    text-align: start;
+
+    &::after {
+      content: normal;
+    }
+  }
+
+  dd {
+    font-weight: normal;
+  }
+
+  .katex {
+    font-size: 1.1em;
+  }
+}
+
+[style*="--aspect-ratio"] > :first-child {
+  width: 100%;
+}
+
+[style*="--aspect-ratio"] > img {
+  height: auto;
+}
+
+@supports (--custom:property) {
+  [style*="--aspect-ratio"] {
+    position: relative;
+  }
+
+  [style*="--aspect-ratio"]::before {
+    content: "";
+    display: block;
+    padding-bottom: calc(100% / (var(--aspect-ratio)));
+  }
+
+  [style*="--add-height"]::before {
+    padding-bottom: calc(100% / (var(--aspect-ratio)) + (var(--add-height)));
+  }
+
+  [style*="--aspect-ratio"] > :first-child {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+  }
+}
diff --git a/_sass/overrides.scss b/_sass/overrides.scss
deleted file mode 100644
index a127eac..0000000
--- a/_sass/overrides.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-a abbr[title] {
-  border-bottom: none;
-}
-
-abbr[title] {
-  text-decoration: none;
-}
-
-code {
-  font-size: 14px;
-  padding: 0.2em 0.4em;
-  border: none;
-}
-
-details {
-  margin-left: 40px;
-  margin-right: 40px;
-}
-
-iframe,
-summary {
-  max-width: 100%;
-}
-
-summary {
-  @extend .btn, .btn-outline;
-  margin-bottom: 1em;
-}
-
-.page {
-  max-width: $content-width;
-  margin: auto;
-}
-
-.page-content {
-  a {
-    white-space: normal;
-  }
-
-  dl {
-    display: block;
-    grid-template-columns: none;
-  }
-
-  dt {
-    font-weight: 700;
-    text-align: start;
-
-    &::after {
-      content: normal;
-    }
-  }
-
-  dd {
-    font-weight: normal;
-  }
-
-  .katex {
-    font-size: 1.1em;
-  }
-}
-
-[style*="--aspect-ratio"] > :first-child {
-  width: 100%;
-}
-
-[style*="--aspect-ratio"] > img {
-  height: auto;
-}
-
-@supports (--custom:property) {
-  [style*="--aspect-ratio"] {
-    position: relative;
-  }
-
-  [style*="--aspect-ratio"]::before {
-    content: "";
-    display: block;
-    padding-bottom: calc(100% / (var(--aspect-ratio)));
-  }
-
-  [style*="--add-height"]::before {
-    padding-bottom: calc(100% / (var(--aspect-ratio)) + (var(--add-height)));
-  }
-
-  [style*="--aspect-ratio"] > :first-child {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-  }
-}
-- 
GitLab