ss

2019-08-08 21:13:02 +08:00
parent b8e2e8f2db abb65e61b7
commit 6476d7f332
2 changed files with 5 additions and 1 deletions
--- a/themes/next/source/css/_variables/custom.styl
+++ b/themes/next/source/css/_variables/custom.styl
@ -2,4 +2,8 @@
 $content-desktop = 700px

 // 当视窗超过 1600px 后的宽度
+<<<<<<< HEAD
 $content-desktop-large = 700px
+=======
+$content-desktop-large = 900px
+>>>>>>> abb65e61b75d94e9b265e42e76a0b58ee73b5e69