From 51d0281ad0a796df14269d38ff7bd3416cfd3522 Mon Sep 17 00:00:00 2001
From: xdavidwu <xdavidwuph@gmail.com>
Date: Mon, 18 Jan 2021 22:31:23 +0800
Subject: [PATCH] merge modifications

---
 _sass/minimal-mistakes/_masthead.scss  |  4 +++-
 _sass/minimal-mistakes/_utilities.scss |  1 +
 assets/css/main.scss                   | 10 ----------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/_sass/minimal-mistakes/_masthead.scss b/_sass/minimal-mistakes/_masthead.scss
index 4de55af..9f5ed1c 100644
--- a/_sass/minimal-mistakes/_masthead.scss
+++ b/_sass/minimal-mistakes/_masthead.scss
@@ -3,11 +3,13 @@
    ========================================================================== */
 
 .masthead {
-  position: relative;
   border-bottom: 1px solid $border-color;
   animation: $intro-transition;
   animation-delay: 0.15s;
   z-index: 20;
+	position: sticky;
+	background: $background-color;
+	top: 0;
 
   &__inner-wrap {
     @include clearfix;
diff --git a/_sass/minimal-mistakes/_utilities.scss b/_sass/minimal-mistakes/_utilities.scss
index b18fd0a..8ffe957 100644
--- a/_sass/minimal-mistakes/_utilities.scss
+++ b/_sass/minimal-mistakes/_utilities.scss
@@ -422,6 +422,7 @@ body:hover .visually-hidden button {
    ========================================================================== */
 
 .sticky {
+	top: 3.375em;
   @include breakpoint($large) {
     @include clearfix();
     position: sticky;
diff --git a/assets/css/main.scss b/assets/css/main.scss
index bf178b3..9e92de8 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -11,16 +11,6 @@ $comments-provider: {{ site.comments.provider }};
 
 @import "minimal-mistakes"; // main partials
 
-.masthead {
-	position: sticky;
-	background: $background-color;
-	top: 0;
-}
-
-.sticky {
-	top: 3.375em;
-}
-
 @media (prefers-color-scheme: light) {
 	@import "minimal-mistakes/skins/{{ site.minimal_mistakes_light_skin | default: 'default' }}"; // skin
   @import "minimal-mistakes"; // main partials
-- 
2.43.0