From ac8c7ed93bfb96b0a522353c025e3f8aa19d3775 Mon Sep 17 00:00:00 2001 From: Kailash Nadh Date: Sat, 3 Nov 2018 17:53:22 +0530 Subject: [PATCH] Add custom theme overhaul - Use 'config-overrides.js' with less loader to load ant.design's less files instead of the compiled css to override theme variables - Change logo, favicon, and primary theme colours - Add pageTitle() to App() to let components set page titles - Move all notifications to bottomRight to avoid blocking action items on the UI --- frontend/my/config-overrides.js | 30 + frontend/my/package.json | 15 +- frontend/my/public/favicon.ico | Bin 3870 -> 0 bytes frontend/my/public/favicon.png | Bin 0 -> 1261 bytes frontend/my/public/index.html | 5 +- frontend/my/src/App.js | 9 +- frontend/my/src/Campaign.js | 12 +- frontend/my/src/Campaigns.js | 1 + frontend/my/src/Dashboard.js | 6 +- frontend/my/src/Import.js | 1 + frontend/my/src/Layout.js | 5 +- frontend/my/src/Lists.js | 20 +- frontend/my/src/Media.js | 3 +- frontend/my/src/Subscribers.js | 23 +- frontend/my/src/Templates.js | 9 +- frontend/my/src/constants.js | 1 + frontend/my/src/index.css | 11 +- frontend/my/src/static/listmonk.svg | 120 +-- frontend/my/yarn.lock | 1453 ++++++++++++++++++++++++++- public/static/logo.svg | 121 --- 20 files changed, 1582 insertions(+), 263 deletions(-) create mode 100644 frontend/my/config-overrides.js delete mode 100644 frontend/my/public/favicon.ico create mode 100644 frontend/my/public/favicon.png delete mode 100644 public/static/logo.svg diff --git a/frontend/my/config-overrides.js b/frontend/my/config-overrides.js new file mode 100644 index 0000000..da82397 --- /dev/null +++ b/frontend/my/config-overrides.js @@ -0,0 +1,30 @@ +const {injectBabelPlugin} = require("react-app-rewired"); +const rewireLess = require("react-app-rewire-less"); + +module.exports = function override(config, env) { + config = injectBabelPlugin( + [ + "import", { + libraryName: "antd", + libraryDirectory: "es", + style: true + } + ], // change importing css to less + config, + ); + config = rewireLess.withLoaderOptions({ + modifyVars: { + "@font-family": + '"IBM Plex Sans", "Helvetica Neueue", "Segoe UI", "sans-serif"', + "@font-size-base": "15px", + "@primary-color": "#7f2aff", + "@shadow-1-up": "0 -2px 3px @shadow-color", + "@shadow-1-down": "0 2px 3px @shadow-color", + "@shadow-1-left": "-2px 0 3px @shadow-color", + "@shadow-1-right": "2px 0 3px @shadow-color", + "@shadow-2": "0 2px 6px @shadow-color" + }, + javascriptEnabled: true, + })(config, env); + return config; +}; \ No newline at end of file diff --git a/frontend/my/package.json b/frontend/my/package.json index 7ebd099..d51b916 100644 --- a/frontend/my/package.json +++ b/frontend/my/package.json @@ -7,20 +7,31 @@ "axios": "^0.18.0", "dayjs": "^1.7.5", "react": "^16.4.1", + "react-app-rewire-less": "^2.1.3", + "react-app-rewired": "^1.6.2", "react-dom": "^16.4.1", "react-quill": "^1.3.1", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", "react-scripts": "1.1.4" }, - "scripts": { + "xxscripts": { "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test --env=jsdom", "eject": "react-scripts eject" }, - "theme": "./src/theme.js", + "scripts": { + "start": "react-app-rewired start", + "build": "react-app-rewired build", + "test": "react-app-rewired test --env=jsdom", + "eject": "react-scripts eject" + }, "eslintConfig": { "extends": "react-app" + }, + "devDependencies": { + "babel-plugin-import": "^1.11.0", + "less-plugin-npm-import": "^2.1.0" } } diff --git a/frontend/my/public/favicon.ico b/frontend/my/public/favicon.ico deleted file mode 100644 index a11777cc471a4344702741ab1c8a588998b1311a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ diff --git a/frontend/my/public/favicon.png b/frontend/my/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..be167d9bbad75457cf7eae463f44417175dec77c GIT binary patch literal 1261 zcmVcobLzECS{M{V3fC4H(qXL4%aw zy=DTYh+jh32Fy($r4yl&JU$Y^`d@|!jqE6K&%iWE_oAM5x%=B zasZ_Wi$*;|PHc^_avLc|I1n!;3G`yHR`Tc#ABegF+DtCOr`L!aAQOxIx*tbE00OMlQZ_IVPe3h7ak#&)>vq21Uq$=bhhr57AT@2Af{pKT?_<@Z&l-vhP@a&r zd>vJQwljl&7{GSdRfQkFd7Wbi%TOzH$28gurZ79BpQm0dX6eeG!iPSVyLirTgjO6O zFNEAOIJBpRAHJ*zAs10nQpa%^zQ@jy;wB|^BBa#V@FHrekJ5U&BwWCKb|X}PmrT2P z?5lFlHf#w78(s{D2UWr2o{44o4z<^lipQM}__iQW&XdN$JvDUySzs@_L^Zf@;kRJ1 z|HohFi#SpDT42DDI)P<5u)HbZGYWy*H4_mF-v)ulolfohUjzgK>6~JIbOGY~fT#*b z4^)B5)XXjQ1`A9JRRa-GzdbaN#hLo&g8>GfSOWS0x;pNmt9@O-ZCOUNv*r@$6gUf9 ziWGr};P%_6j=YTeCNxF?Bhdvw3qV`*CR?S5ui4KEB_b>|oswlb<&H9^EcPf_s=Na9 z+eD=Le~(PvqSEbz?c}^U+$DoqLJHScF1sw= z0BU2CywzauYSMC=HYpddyZD6B1yalanY-ep{7S z%~g7LQVLe{mO`%0vn$#SirJJ}!Zs!FV5F;1XRgx1>6ul`94)nAyWbmVs>_vGdY`_A} zh|-3^kiw0ktW#JPR(uj+v)L-Ou^1BQdR0nSv)vFXR3p3EIJhJR#nU}tasQb3AX@H} zDzB1@@@)dd{{ofb;?_i7&!qc)Ge?&KkE>E3zV2qO81$*qB?k4Q21nj$k+Ed!UN`&) XF;kv+Oedi200000NkvXXu0mjf^K?Bc literal 0 HcmV?d00001 diff --git a/frontend/my/public/index.html b/frontend/my/public/index.html index ac8ab82..2288373 100644 --- a/frontend/my/public/index.html +++ b/frontend/my/public/index.html @@ -5,9 +5,10 @@ + - - React App + + %PUBLIC_URL%