Merge remote-tracking branch 'upstream/main' into HEAD

Author: FlynnD273

source/_sass/app.scss

@@ -15,8 +15,13 @@
  */
 
 @use "sass:color";
+<<<<<<< HEAD
 @use "sass:meta";
 @use 'bourbon/bourbon';
+=======
+
+@import 'bourbon/bourbon';
+>>>>>>> upstream/main
 
 @use 'colors';
 
@@ -65,15 +70,25 @@ body {
 code {
   background-color: colors.$white;
   border-radius: 2px;
+<<<<<<< HEAD
   color: color.adjust(variables.$base-font-color, $lightness: -20%, $space: hsl);
   font-family: font-family.$monospace;
   font-size: variables.$base-font-size;
+=======
+  color: color.adjust($base-font-color, $lightness: -20%, $space: hsl);
+  font-family: $monospace;
+  font-size: $base-font-size;
+>>>>>>> upstream/main
   padding: 2px 4px;
   box-shadow: inset 0 0 2px #bbb;
 }
 
 a code {
+<<<<<<< HEAD
   color: color.adjust(variables.$base-link-color, $lightness: -10%, $space: hsl);
+=======
+  color: color.adjust($base-link-color, $lightness: -10%, $space: hsl);
+>>>>>>> upstream/main
 }
 
 .container {

source/_sass/base/_lists.scss

@@ -24,23 +24,41 @@ ol {
 
   &%default-ul {
     list-style-type: disc;
+<<<<<<< HEAD
     margin-bottom: variables.$base-line-height * 0.5;
     padding-left: variables.$base-line-height;
+=======
+    margin-bottom: $base-line-height * 0.5;
+    padding-left: $base-line-height;
+>>>>>>> upstream/main
   }
 
   &%default-ol {
     list-style-type: decimal;
+<<<<<<< HEAD
     margin-bottom: variables.$base-line-height * 0.5;
     padding-left: variables.$base-line-height;
+=======
+    margin-bottom: $base-line-height * 0.5;
+    padding-left: $base-line-height;
+>>>>>>> upstream/main
   }
 }
 
 dl {
+<<<<<<< HEAD
   margin-bottom: variables.$base-line-height * 0.5;
 
   dt {
     font-weight: bold;
     margin-top: variables.$base-line-height * 0.5;
+=======
+  margin-bottom: $base-line-height * 0.5;
+
+  dt {
+    font-weight: bold;
+    margin-top: $base-line-height * 0.5;
+>>>>>>> upstream/main
   }
 
   dd {

source/_sass/base/_tables.scss

@@ -22,12 +22,20 @@ table {
 
 th {
   font-weight: bold;
+<<<<<<< HEAD
   padding: (variables.$base-line-height * 0.5) 0;
+=======
+  padding: ($base-line-height * 0.5) 0;
+>>>>>>> upstream/main
   text-align: left;
 }
 
 td {
+<<<<<<< HEAD
   padding: (variables.$base-line-height * 0.5) 0;
+=======
+  padding: ($base-line-height * 0.5) 0;
+>>>>>>> upstream/main
 }
 
 tr,

source/_sass/base/_typography.scss

@@ -15,9 +15,12 @@
  */
 
 @use "sass:color";
+<<<<<<< HEAD
 @use "../bourbon/css3/transition";
 @use "variables";
 
+=======
+>>>>>>> upstream/main
 
 body {
   -webkit-font-smoothing: antialiased;
@@ -98,6 +101,7 @@ img {
 }
 
 blockquote {
+<<<<<<< HEAD
   border-left: 2px solid variables.$base-border-color;
   color: color.adjust(variables.$base-font-color, $lightness: 15%, $space: hsl);
   margin: variables.$base-line-height 0;
@@ -106,6 +110,16 @@ blockquote {
 
 cite {
   color: color.adjust(variables.$base-font-color, $lightness: 25%, $space: hsl);
+=======
+  border-left: 2px solid $base-border-color;
+  color: color.adjust($base-font-color, $lightness: 15%, $space: hsl);
+  margin: $base-line-height 0;
+  padding-left: $base-line-height * 0.5;
+}
+
+cite {
+  color: color.adjust($base-font-color, $lightness: 25%, $space: hsl);
+>>>>>>> upstream/main
   font-style: italic;
 
   &:before {

source/_sass/base/_variables.scss

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+<<<<<<< HEAD
 @use "../bourbon/addons/font-family";
 @use "../bourbon/functions/px-to-em";
 @use "../colors";
 
+=======
+>>>>>>> upstream/main
 @use "sass:color";
 
 // Typography
@@ -61,7 +64,11 @@ $form-border-color: $base-border-color;
 $form-border-color-hover: color.adjust($base-border-color, $lightness: -10%, $space: hsl);
 $form-border-color-focus: $base-accent-color;
 $form-border-radius: $base-border-radius;
+<<<<<<< HEAD
 $form-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);
+=======
+$form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06);
+>>>>>>> upstream/main
 $form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(color.adjust($form-border-color-focus, $lightness: -5%, $space: hsl), 0.7);
 $form-font-size: $base-font-size;
 $form-font-family: $base-font-family;

source/_sass/base/mixins/_flash.scss

@@ -15,15 +15,23 @@
  */
 
 @use "sass:color";
+<<<<<<< HEAD
 @use "../variables";
 
+=======
+>>>>>>> upstream/main
 
 @mixin flash($color) {
   background: $color;
   color: color.adjust($color, $lightness: -60%, $space: hsl);
   font-weight: bold;
+<<<<<<< HEAD
   margin-bottom: variables.$base-line-height * 0.5;
   padding: variables.$base-line-height * 0.5;
+=======
+  margin-bottom: $base-line-height * 0.5;
+  padding: $base-line-height * 0.5;
+>>>>>>> upstream/main
 
   a {
     color: color.adjust($color, $lightness: -70%, $space: hsl);