diff --git a/styles/notion.css b/styles/notion.css index c7d939be..50ce45f3 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -724,7 +724,6 @@ svg.notion-page-icon { .notion-text { width: 100%; white-space: pre-wrap; - line-height: 1.5rem !important; word-break: break-word; padding: 3px 2px !important; margin: 1px 0 !important; diff --git a/themes/commerce/components/Footer.js b/themes/commerce/components/Footer.js index 0a0852cc..180f1005 100644 --- a/themes/commerce/components/Footer.js +++ b/themes/commerce/components/Footer.js @@ -56,12 +56,33 @@ const Footer = (props) => { })} - {siteConfig('COMMERCE_TEXT_FOOTER_LINKS') &&
-
{siteConfig('COMMERCE_TEXT_FOOTER_TITLE', 'Contact US')}
-
{siteConfig('COMMERCE_TEXT_FOOTER_LINKS')}
+
{siteConfig('COMMERCE_TEXT_FOOTER_TITLE', 'Contact US')}
+
+
+ {JSON.parse(siteConfig('COMMERCE_CONTACT_WHATSAPP_SHOW'), true) &&
+ { + + } +
+ } + + {JSON.parse(siteConfig('COMMERCE_CONTACT_TELEGRAM_SHOW', true)) &&
+ { + + } +
} + +
+
{siteConfig('CONTACT_EMAIL') && + {siteConfig('CONTACT_EMAIL')} + }
+
{siteConfig('CONTACT_PHONE') &&
+ {siteConfig('CONTACT_PHONE')} +
}
+
} diff --git a/themes/commerce/components/SocialButton.js b/themes/commerce/components/SocialButton.js index ef3c28c6..555e8ea6 100644 --- a/themes/commerce/components/SocialButton.js +++ b/themes/commerce/components/SocialButton.js @@ -1,6 +1,4 @@ -import BLOG from '@/blog.config' -import React from 'react' - +import { siteConfig } from '@/lib/config' /** * 社交联系方式按钮组 * @returns {JSX.Element} @@ -9,34 +7,34 @@ import React from 'react' const SocialButton = () => { return
- {BLOG.CONTACT_GITHUB && + {siteConfig('CONTACT_GITHUB') && } - {BLOG.CONTACT_TWITTER && + {siteConfig('CONTACT_TWITTER') && } - {BLOG.CONTACT_TELEGRAM && + {siteConfig('CONTACT_TELEGRAM') && } - {BLOG.CONTACT_LINKEDIN && + {siteConfig('CONTACT_LINKEDIN') && } - {BLOG.CONTACT_WEIBO && + {siteConfig('CONTACT_WEIBO') && } - {BLOG.CONTACT_INSTAGRAM && + {siteConfig('CONTACT_INSTAGRAM') && } - {BLOG.CONTACT_EMAIL && + {siteConfig('CONTACT_EMAIL') && } - {JSON.parse(BLOG.ENABLE_RSS) && + {JSON.parse(siteConfig('ENABLE_RSS')) && } - {BLOG.CONTACT_BILIBILI && + {siteConfig('CONTACT_BILIBILI') && } - {BLOG.CONTACT_YOUTUBE && + {siteConfig('CONTACT_YOUTUBE') && }
diff --git a/themes/commerce/index.js b/themes/commerce/index.js index c15449a1..ece0fc74 100644 --- a/themes/commerce/index.js +++ b/themes/commerce/index.js @@ -111,9 +111,9 @@ const LayoutIndex = (props) => { {/* 首页企业/品牌介绍 */} - {notice &&
+ {notice &&
{siteConfig('TEXT_HOME_ABOUT_US', notice.title)}
- +
} {/* 铺开导航菜单 */} diff --git a/themes/commerce/style.js b/themes/commerce/style.js index ff5589ce..fd363958 100644 --- a/themes/commerce/style.js +++ b/themes/commerce/style.js @@ -13,6 +13,11 @@ const Style = () => { .dark body{ background-color: black; } + + // 产品介绍区域字体放大 + #brand-introduction .notion { + font-size: 1.3rem !important; + } /* 菜单下划线动画 */ #theme-commerce .menu-link { @@ -61,12 +66,12 @@ const Style = () => { } ::-webkit-scrollbar-thumb { - background-color: #49b1f5; + background-color: #D2232A; } * { scrollbar-width:thin; - scrollbar-color: #49b1f5 transparent + scrollbar-color: #D2232A transparent }