fix: Set layout.content option, some pixels less actually

liuyib · Feb 24, 2020 · 1d931f4 · 1d931f4
1 parent aa918d3
commit 1d931f4
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/source/css/_variables/index.styl b/source/css/_variables/index.styl
@@ -28,14 +28,35 @@ $sm-width = 768px - 0.02px
 $md-width = 992px - 0.02px
 $lg-width = 1200px - 0.02px
 
+get-main-padding() {
+  $main-padding = convert(hexo-config('layout.main_padding.default'));
+  $gap-left = 0;
+  $gap-right = 0;
+
+  if ($main-padding[1]) {
+    $gap-right = $main-padding[1];
+
+    if ($main-padding[3]) {
+      $gap-left = $main-padding[3];
+    } else {
+      $gap-left = $main-padding[1];
+    }
+  } else {
+    $gap-left = $gap-right = $main-padding[0];
+  }
+
+  return $gap-left $gap-right;
+}
+
 // Width
+$main-padding-width     = get-main-padding()[0] + get-main-padding()[1]
 $content-width          = convert(hexo-config('layout.content') || '$sm-width')
 $sidebar-width          = convert(hexo-config('layout.sidebar') || '300px')
 $content-sidebar-gap    = convert(hexo-config('layout.content_sidebar_gap') || '30px')
 if (hexo-config('sidebar.enable')) {
-  $main-width           = $content-width + $sidebar-width + $content-sidebar-gap
+  $main-width           = $content-width + $sidebar-width + $content-sidebar-gap + $main-padding-width
 } else {
-  $main-width           = $content-width
+  $main-width           = $content-width + $main-padding-width
 }
 
 // -------------------------------------------