From 18cde68094fda27189294bf1e9457097b1df9673 Mon Sep 17 00:00:00 2001 From: Kevin Lin <kevinl@cs.uw.edu> Date: Sun, 14 Jun 2020 08:49:51 -0700 Subject: [PATCH] _sass: Simplify and inline variables --- _sass/custom/custom.scss | 1 - _sass/custom/mixins.scss | 2 +- _sass/custom/staffer.scss | 2 +- _sass/custom/variables.scss | 14 -------------- 4 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 _sass/custom/variables.scss diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss index 5067b2d..08c4fb5 100644 --- a/_sass/custom/custom.scss +++ b/_sass/custom/custom.scss @@ -1,5 +1,4 @@ // Just the Class dependencies -@import 'variables'; @import 'mixins'; @import 'card'; diff --git a/_sass/custom/mixins.scss b/_sass/custom/mixins.scss index 4d8645c..a337fce 100644 --- a/_sass/custom/mixins.scss +++ b/_sass/custom/mixins.scss @@ -1,5 +1,5 @@ @mixin abstract-card() { - box-shadow: $box-shadow; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.07), 0 4px 14px rgba(0, 0, 0, 0.05); margin-left: -$gutter-spacing-sm; margin-right: -$gutter-spacing-sm; margin-bottom: $sp-4; diff --git a/_sass/custom/staffer.scss b/_sass/custom/staffer.scss index 8e87d30..cfc3309 100644 --- a/_sass/custom/staffer.scss +++ b/_sass/custom/staffer.scss @@ -12,7 +12,7 @@ .staffer-image { border-radius: 50%; - height: $staffer-image-size; + height: 100px; margin-right: $sp-4; } diff --git a/_sass/custom/variables.scss b/_sass/custom/variables.scss deleted file mode 100644 index 4c7a3f1..0000000 --- a/_sass/custom/variables.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Typography -$body-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; - -// Layout -$gutter-spacing: $sp-6; -$gutter-spacing-sm: $sp-4; -$nav-width: 216px; -$nav-width-md: 216px; -$content-width: 784px; - -// Components -$box-shadow: 0 1px 3px rgba(0, 0, 0, 0.07), 0 4px 14px rgba(0, 0, 0, 0.05); -$module-date-color: $link-color; -$staffer-image-size: 100px; -- GitLab