From 85e1c57f77448e07605c079423d7e797bc5eaedd Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 20 Sep 2020 17:23:13 -0500 Subject: [PATCH] =?UTF-8?q?feat(web):=20=F0=9F=92=84=F0=9F=9A=A7=20apply?= =?UTF-8?q?=20dark=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #466 --- web/config-overrides.js | 16 ++++++++++++++-- web/package-lock.json | Bin 664879 -> 668660 bytes web/package.json | 2 ++ web/src/App.tsx | 11 ++--------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/web/config-overrides.js b/web/config-overrides.js index b2a41e367..d0b3cc22c 100644 --- a/web/config-overrides.js +++ b/web/config-overrides.js @@ -1,9 +1,21 @@ -const { override, fixBabelImports } = require("customize-cra"); +const { getThemeVariables } = require("antd/dist/theme"); +const { override, fixBabelImports, addLessLoader } = require("customize-cra"); module.exports = override( fixBabelImports("import", { libraryName: "antd", libraryDirectory: "es", - style: "css", + style: true, + }), + addLessLoader({ + lessOptions: { + javascriptEnabled: true, + modifyVars: { + ...getThemeVariables({ + dark: true, + // compact: true, + }), + }, + }, }) ); diff --git a/web/package-lock.json b/web/package-lock.json index 4a81bfc0e090de171083d7db44cc2e48de945bde..5043fc1a705c9a7141800322d0b74e723ccb19cd 100644 GIT binary patch delta 1457 zcmZ`(YiL_#7$zq2{W!OHOWs!E(P}PSP|N*lN<`Bsob=Pwtm7 z?T?}e6IKSkf^4fl6b9-h465J_(f#m;ZcfENa|1yc2o4d4^N;DeQ3msamyh@Pc=;Zl z_kG?gU(f#a+wAg+WCdA~UX%ImqnScp+kpGO%6CI_o7^~2sy;$W{XC&1wh}D~Yg&os zc}i=~5%HRVEHI+6+rbNgQrfELIf3sPIH~TErVZ zYnhGkVPmq)dVO=DEa#`AjcT@I=DL(fSIg;~NW0RhB^nQOlBpEY>Ud$tpVIO5FW*Dm zQXrMcgjBDiV4qpej8yWC#(==arQHA}SEL8#acZ89*n_Te01tb4n()+{^>(^L+U#T_ z6$pCmJ}%4hEuQe3?M|UmcO{Kc!=m3`==Yn=M%v-&b=gpW;%mXEllO=8e1>r9SvYre zXy=A5Q*aJbV(|UDiZKX!B`R3{8yi+@wq({Eo7TKY>I^y(?w&x8z=h8+Y>Lt`I!bd? zIsN!(giN#4&TH%WS}WgZ!rC9mIQ+aI-7X)L8V99pOMU=uUy;th<%^1Y^36)PG%1^S z{W6Ba#Y@--oO=^f!^b|!zyJHJJb!vjja2eLeI=iU6Aus>{C)>hg3f}>?s+6zWhs-( z*Pn>EnQ2Y%)(mpO@JmJefcxV9?YjZie~JFPImh3AkFxOH4M1E1$)=&7j791TYoi@fM} z8%QGI;>_J@!PF?&1FlkPz^s<@bCt4D-zf&!#YEH~6x@6%mMjM>S-#sd+Gs%x`)N-s z7-B5E(-w@CGlk>FA9v}A)>GhCA^YKl!%`GbRzkqqjARIYxrC0vRTZL!(UU_cTvs8x z06!zy4U;v+Az0ofJq9n;6no)(OLhn%HxcwygmIBYI+{tu+7V~jVX_4rE>>vAI9%}K zox0u`i}Rtmp4GjSt<_6>HDRIqi+C(-%rPQkqdG+sZXY*g+ugAjg3C5!)-Ff&C6WvJmr>Ld{?}?oQZP zU#IVlmF83amYH^!<{38S&PPQ3Qm&Gsnk|3WRERXiqIJ#?CBz=dS&iLhwh#yq(RS09 z7UGtyxk0+98ku~Sk_+8|bivyL(>#1bJ`8~er~O~u^*Z(e`V%MHunJHo6_YS+7|ie#Bco@YcFFEi7Iiwi|zBY2Ukj*Lqef=IwL$v0h7?Zt;?te|q^d7Ln-_ f-m|hy*DGf>YX7gs2E^<@%mKul+yAR^edPfFPHrKb diff --git a/web/package.json b/web/package.json index 815f63f98..8c348b705 100644 --- a/web/package.json +++ b/web/package.json @@ -50,6 +50,8 @@ "devDependencies": { "eslint-config-prettier": "^6.11.0", "eslint-plugin-prettier": "^3.1.4", + "less": "^3.12.2", + "less-loader": "^7.0.1", "prettier": "^2.1.2" } } diff --git a/web/src/App.tsx b/web/src/App.tsx index 000d6fdf2..f748b3ebd 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -22,19 +22,14 @@ const { Header, Content, Footer } = Layout; export const App: React.FC = () => ( - -
+ +
( style={{ textAlign: "center", padding: "6px 50px", - background: "#fff", lineHeight: "28px", }} > @@ -73,7 +67,6 @@ const Logo = () => ( src={`${process.env.PUBLIC_URL}/logo_filterlists.png`} alt="FilterLists logo" height="44px" - style={{ background: "#fff" }} /> );