From 474aa4af3df69a4b8adf35052064d8a36f559117 Mon Sep 17 00:00:00 2001 From: vapao Date: Sun, 3 Apr 2022 00:34:39 +0800 Subject: [PATCH] =?UTF-8?q?U=20=E7=BB=9F=E4=B8=80=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_web/config-overrides.js | 9 ++++++++- spug_web/src/index.js | 2 +- spug_web/src/{index.css => index.less} | 2 +- spug_web/src/layout/Sider.js | 4 +--- spug_web/src/layout/index.js | 2 +- spug_web/src/layout/layout.module.less | 4 ++-- spug_web/src/layout/logo-spug-white.png | Bin 0 -> 3262 bytes spug_web/src/layout/logo-text.png | Bin 887 -> 0 bytes 8 files changed, 14 insertions(+), 9 deletions(-) rename spug_web/src/{index.css => index.less} (95%) create mode 100644 spug_web/src/layout/logo-spug-white.png delete mode 100644 spug_web/src/layout/logo-text.png diff --git a/spug_web/config-overrides.js b/spug_web/config-overrides.js index 34a4ab5..a66ddc5 100644 --- a/spug_web/config-overrides.js +++ b/spug_web/config-overrides.js @@ -7,5 +7,12 @@ const {override, addDecoratorsLegacy, addLessLoader} = require('customize-cra'); module.exports = override( addDecoratorsLegacy(), - addLessLoader(), + addLessLoader({ + lessOptions: { + javascriptEnabled: true, + modifyVars: { + '@primary-color': '#2563fc' + } + } + }), ); diff --git a/spug_web/src/index.js b/spug_web/src/index.js index 8d691d8..58f5b7e 100644 --- a/spug_web/src/index.js +++ b/spug_web/src/index.js @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom'; import { Router } from 'react-router-dom'; import { ConfigProvider } from 'antd'; import zhCN from 'antd/es/locale/zh_CN'; -import './index.css'; +import './index.less'; import App from './App'; import moment from 'moment'; import 'moment/locale/zh-cn'; diff --git a/spug_web/src/index.css b/spug_web/src/index.less similarity index 95% rename from spug_web/src/index.css rename to spug_web/src/index.less index 4005737..69b8796 100644 --- a/spug_web/src/index.css +++ b/spug_web/src/index.less @@ -1,4 +1,4 @@ -@import '~antd/dist/antd.css'; +@import '~antd/dist/antd.less'; body { margin: 0; diff --git a/spug_web/src/layout/Sider.js b/spug_web/src/layout/Sider.js index 098720f..238bbfc 100644 --- a/spug_web/src/layout/Sider.js +++ b/spug_web/src/layout/Sider.js @@ -3,8 +3,7 @@ import { Layout, Menu } from 'antd'; import { hasPermission, history } from 'libs'; import styles from './layout.module.less'; import menus from '../routes'; -import logo from './logo-spug.png'; -import logoText from './logo-text.png'; +import logo from './logo-spug-white.png'; let selectedKey = window.location.pathname; const OpenKeysMap = {}; @@ -56,7 +55,6 @@ export default function Sider(props) {
Logo - logo-text
setCollapsed(!collapsed)}/> - + {Routes} diff --git a/spug_web/src/layout/layout.module.less b/spug_web/src/layout/layout.module.less index 8fc4727..e3799f4 100644 --- a/spug_web/src/layout/layout.module.less +++ b/spug_web/src/layout/layout.module.less @@ -98,12 +98,12 @@ .logo { height: 64px; line-height: 64px; - padding-left: 15px; overflow: hidden; + text-align: center; } .logo img { - width: 50px; + height: 30px; } } diff --git a/spug_web/src/layout/logo-spug-white.png b/spug_web/src/layout/logo-spug-white.png new file mode 100644 index 0000000000000000000000000000000000000000..d8af69b294e115006398e48c67747b8a49e613ff GIT binary patch literal 3262 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 literal 0 HcmV?d00001 diff --git a/spug_web/src/layout/logo-text.png b/spug_web/src/layout/logo-text.png deleted file mode 100644 index 5a55b5470ebf0d8ee36f85f1295c18e8ded029f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmeAS@N?(olHy`uVBq!ia0vp^AAnewgBeIJ*A@!|QjEnx?oNz1PwLbIIh+L^k;M!Q zddeWoSh3W;45&abz$e62IsUt9;vYt@+dx%vVUJ~Fz9}dEmQVhsnD|RE@rPpkFNN5z zs>y#qDCxUO@*kC?->S*KRFZ$ICjF61_y&>z07@|vp{DS2i*cmuwOr;DI3?*OwmtCG8mv%_{#o-X1C+oe9 z&-NN=oU^day6-+=L)ET>>LP_pEsqK?=|=plQ3>;ynezPl-7{Je)~jvw8hJTxWUpxM z`Wso`IrXMs>82p&T+7nwJ-|4a;pyTSQZeW4&Gg_y4gw7iUj(w4n2B(I>syo|BK<8+ zaQDCe@{1-*7M-3EQ`Vg5bmP0U`OTfR`%;^hZM~Q+epN|s+2U(kI!<2R5x_F-&4lHg z{L|I9hNO#I#>U<9o&Rp)<-MP___MNke>;8o3&Y<}j=m``f*EW~eCDww7$(itI+)r$x<%Jwy-d_s(LHT3u_AjKva^gfBp8^oSszI-h7ih455DrIxGgxi z(N{-e?%&m^0SBUwzLh=h#2L0W&)|l2MY;dgx*rE_NaS3zDA?EXMnNT^q}`Y4nsL1q zm+6gV$!!1Ge>@QheD%i0B;jj!`_w|lx-CpQ)Sxz8z4hRQYSGRO4V#ayel6{@eP7f2 zDdplZ2fn|$`gBt7Z-xhK$HJc9U&`Zl6zCpf3yB9mnAaYUk!+f;1q`_Z=Z~C@k5l}y w*6H=%#XgmnH~qSDcmBuK>)-D>=6#HxG4@*b=_p=1U{YZ4boFyt=akR{04DK`V*mgE