Use @require instead of @import

next-theme · Jul 30, 2020 · 33723be · 33723be · stevenjoezhang · Nov 16, 2020
1 parent fc68fbe
commit 33723be
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/source/css/_common/components/post/post-followme.styl b/source/css/_common/components/post/post-followme.styl
@@ -12,15 +12,16 @@
     display: flex;
     flex-wrap: wrap;
 
-    .social-item {
-      margin: .5em 2em;
-    }
     +tablet-mobile() {
       .social-item {
         margin: .5em .75em;
       }
     }
 
+    .social-item {
+      margin: .5em 2em;
+    }
+
     .social-link {
       border: 0;
       display:inline-block;

diff --git a/source/css/_common/components/post/post-nav.styl b/source/css/_common/components/post/post-nav.styl
@@ -1,6 +1,7 @@
 .post-nav {
   border-top: 1px solid $gainsboro;
   display: flex;
+  gap: 30px;
   justify-content: space-between;
   margin-top: 15px;
   padding: 10px 5px 0;
@@ -25,15 +26,12 @@
   }
 
   &:first-child {
-    margin-right: 15px;
-
     .fa {
       margin-right: 5px;
     }
   }
 
   &:last-child {
-    margin-left: 15px;
     text-align: right;
 
     .fa {

diff --git a/source/css/_common/components/post/post-reward.styl b/source/css/_common/components/post/post-reward.styl
@@ -37,7 +37,7 @@
 
     if (hexo-config('reward_settings.animation')) {
       &:hover p {
-        animation: roll .1s infinite linear;
+        animation: next-roll .1s infinite linear;
         // The animation may affect :hover of img in dark mode
         pointer-events: none;
       }
@@ -52,7 +52,7 @@
   }
 }
 
-@keyframes roll {
+@keyframes next-roll {
   from {
     transform: rotateZ(30deg);
   }

diff --git a/source/css/_common/scaffolding/highlight/highlight.styl b/source/css/_common/scaffolding/highlight/highlight.styl
@@ -1,17 +1,18 @@
-@import hexo-config('highlight.light.file') if (hexo-config('highlight.enable'));
+// Use `@require` to fix issue #67
+@require hexo-config('highlight.light.file') if (hexo-config('highlight.enable'));
 if (hexo-config('prism.enable')) {
-  @import hexo-config('prism.light');
-  @import hexo-config('prism.number');
+  @require hexo-config('prism.light');
+  @require hexo-config('prism.number');
 }
 
 if (hexo-config('darkmode')) {
   @media (prefers-color-scheme: dark) {
-    @import hexo-config('highlight.dark.file') if (hexo-config('highlight.enable'));
-    @import hexo-config('prism.dark') if (hexo-config('prism.enable'));
+    @require hexo-config('highlight.dark.file') if (hexo-config('highlight.enable'));
+    @require hexo-config('prism.dark') if (hexo-config('prism.enable'));
   }
 }
 
-@import 'copy-code' if (hexo-config('codeblock.copy_button.enable'));
+@require 'copy-code' if (hexo-config('codeblock.copy_button.enable'));
 
 // Placeholder: $code-inline $code-block
 $code-inline {

diff --git a/source/css/_common/scaffolding/tags/link-grid.styl b/source/css/_common/scaffolding/tags/link-grid.styl
@@ -20,7 +20,7 @@
     transition: background .3s;
 
     &:hover {
-      animation: shake .5s;
+      animation: next-shake .5s;
       background: var(--card-bg-color);
     }
 
@@ -67,7 +67,7 @@
   }
 }
 
-@keyframes shake {
+@keyframes next-shake {
   0% {
     transform: translate(1pt, 1pt) rotate(0deg);
   }