refactor: Change the support unit of header & nav height

liuyib · Jun 18, 2019 · 6f9f3a5 · 6f9f3a5
1 parent d834e1a
commit 6f9f3a5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/source/css/_common/header.styl b/source/css/_common/header.styl
@@ -1,6 +1,7 @@
+$header-height = convert(hexo-config('header.height') || '80vh')
 if (hexo-config('header.height'))
-  $header-height = unit(
-    convert(hexo-config('header.height') || '80%'), 'vh')
+  if (match('%', hexo-config('header.height')))
+    $header-height = unit(convert(hexo-config('header.height')), 'vh')
 
 #header
   display: flex
@@ -27,8 +28,10 @@ $header-nav-color
       &::after
         color: $header-nav-link-hover-color
 
-$header-nav-height = convert(
-  hexo-config('header.nav_height') || '50px')
+$header-nav-height = convert(hexo-config('header.nav_height') || '50px')
+if (hexo-config('header.nav_height'))
+  if (match('%', hexo-config('header.nav_height')))
+    $header-nav-height = unit(convert(hexo-config('header.nav_height')), 'vh')
 
 .header-nav
   position: fixed