diff --git a/packages/design/components/Layout/style/index.less b/packages/design/components/Layout/style/index.less index 4cf7e30c1..2e5b32b5b 100644 --- a/packages/design/components/Layout/style/index.less +++ b/packages/design/components/Layout/style/index.less @@ -5,7 +5,7 @@ grid-template-columns: repeat(4, minmax(0, 1fr)) 246px; &--alpha { - gap: 40px; + gap: 30px; .bgm-layout__left { grid-column: span 4 / span 4; diff --git a/packages/design/theme/variables.less b/packages/design/theme/variables.less index f6561029b..394a484ca 100644 --- a/packages/design/theme/variables.less +++ b/packages/design/theme/variables.less @@ -25,3 +25,4 @@ @sm: 640px; @md: 768px; @lg: 1024px; +@max-width: 1260px; diff --git a/packages/website/src/components/Footer/style.module.less b/packages/website/src/components/Footer/style.module.less index b5d1ac8c5..1426f6e54 100644 --- a/packages/website/src/components/Footer/style.module.less +++ b/packages/website/src/components/Footer/style.module.less @@ -27,7 +27,8 @@ } .footerMain { - width: 1380px; + box-sizing: border-box; + width: @max-width; height: 100%; background-color: #f47a81; // Fallback background color background-image: url('../../assets/footer-cover.png'); diff --git a/packages/website/src/components/GlobalLayout/style.module.less b/packages/website/src/components/GlobalLayout/style.module.less index 6d855b1ab..c28dc71de 100644 --- a/packages/website/src/components/GlobalLayout/style.module.less +++ b/packages/website/src/components/GlobalLayout/style.module.less @@ -13,7 +13,7 @@ .contentWrapper { flex: 1 0 auto; width: 100%; - max-width: 1440px; + max-width: @max-width; margin: 0 auto; padding: 24px 30px; box-sizing: border-box; diff --git a/packages/website/src/components/Header/index.tsx b/packages/website/src/components/Header/index.tsx index 103a3fbcb..70a9f9186 100644 --- a/packages/website/src/components/Header/index.tsx +++ b/packages/website/src/components/Header/index.tsx @@ -4,7 +4,7 @@ import React, { useState } from 'react'; import { Link, useLocation } from 'react-router-dom'; import { Avatar, Button, Divider, Input, Menu } from '@bangumi/design'; -import { Notification, Search as SearchIcon, Setting } from '@bangumi/icons'; +import { Notification, Search as SearchIcon } from '@bangumi/icons'; import { UnreadableCodeError } from '@bangumi/utils'; import { useNotify } from '@bangumi/website/hooks/use-notify'; @@ -158,8 +158,6 @@ const Header: FC = () => { > - - ) : ( diff --git a/packages/website/src/components/Header/style.module.less b/packages/website/src/components/Header/style.module.less index 90b446e74..48789d638 100644 --- a/packages/website/src/components/Header/style.module.less +++ b/packages/website/src/components/Header/style.module.less @@ -21,13 +21,14 @@ .justify-between(); .h-full(); - max-width: 1440px; + box-sizing: border-box; + max-width: @max-width; + padding: 0 30px 0 24px; margin: 0 auto; } .logo { position: relative; - margin-left: 24px; flex-shrink: 0; width: 193px; height: @header-height; @@ -57,11 +58,11 @@ .nav { display: flex; align-items: center; - margin: 0 0 0 63px; + margin: 0 0 0 30px; .divider { display: inline-block; - margin: 0 35px; + margin: 0 27px; height: 19px; } @@ -86,6 +87,7 @@ .flex(); .items-center(); + // Todo: add `flex-gap-polyfill` gap: 12px; } @@ -197,7 +199,7 @@ } /* 临时的移动端适配 */ -@media screen and (max-width: 1440px) { +@media screen and (max-width: @max-width) { .avatar { margin-right: 10px; }