diff --git a/layout/index.ejs b/layout/index.ejs index c88825a..0cef5b5 100644 --- a/layout/index.ejs +++ b/layout/index.ejs @@ -1,5 +1,5 @@ <% const isChildPage = page.type === 'child' %> -<% const setting = isChildPage ? Object.assign(theme, page) : theme %> +<% const setting = isChildPage ? Object.assign({}, theme, page) : theme %> <%# console.log(page.path) %>
diff --git a/layout/layout.ejs b/layout/layout.ejs index 5eba869..ace396e 100644 --- a/layout/layout.ejs +++ b/layout/layout.ejs @@ -1,6 +1,6 @@ -<% const setting = page ? Object.assign(theme, page) : theme %> +<% const setting = page ? Object.assign({}, theme, page) : theme %> <%- partial('common/head', {setting:setting}) %> diff --git a/package.json b/package.json index 4b62805..a41c485 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-webstack", - "version": "2.0.3", + "version": "2.0.4", "description": "A hexo theme based on webstack.", "keywords": [ "hexo",