From f6c1dad342c6d3df0b1670dc4c62db1e9f90a4ec Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:40:17 +0530 Subject: [PATCH] fix: extend custom tailwind valiables instead of overwriting (#2525) --- .../tailwind-config-custom/tailwind.config.js | 275 +++++++++--------- 1 file changed, 138 insertions(+), 137 deletions(-) diff --git a/packages/tailwind-config-custom/tailwind.config.js b/packages/tailwind-config-custom/tailwind.config.js index 3825394d3..8a03462c0 100644 --- a/packages/tailwind-config-custom/tailwind.config.js +++ b/packages/tailwind-config-custom/tailwind.config.js @@ -16,143 +16,6 @@ module.exports = { ], }, theme: { - // scale down font sizes to 90% of default - fontSize: { - xs: "0.675rem", - sm: "0.7875rem", - base: "0.9rem", - lg: "1.0125rem", - xl: "1.125rem", - "2xl": "1.35rem", - "3xl": "1.6875rem", - "4xl": "2.25rem", - "5xl": "2.7rem", - "6xl": "3.375rem", - "7xl": "4.05rem", - "8xl": "5.4rem", - "9xl": "7.2rem", - }, - // scale down spacing to 90% of default - padding: { - 0: "0", - 0.5: "0.1125rem", - 1: "0.225rem", - 1.5: "0.3375rem", - 2: "0.45rem", - 2.5: "0.5625rem", - 3: "0.675rem", - 3.5: "0.7875rem", - 4: "0.9rem", - 5: "1.125rem", - 6: "1.35rem", - 7: "1.575rem", - 8: "1.8rem", - 9: "2.025rem", - 10: "2.25rem", - 11: "2.475rem", - 12: "2.7rem", - 16: "3.6rem", - 20: "4.5rem", - 24: "5.4rem", - 32: "7.2rem", - 40: "9rem", - 48: "10.8rem", - 56: "12.6rem", - 64: "14.4rem", - 72: "16.2rem", - 80: "18rem", - 96: "21.6rem", - }, - margin: { - 0: "0", - 0.5: "0.1125rem", - 1: "0.225rem", - 1.5: "0.3375rem", - 2: "0.45rem", - 2.5: "0.5625rem", - 3: "0.675rem", - 3.5: "0.7875rem", - 4: "0.9rem", - 5: "1.125rem", - 6: "1.35rem", - 7: "1.575rem", - 8: "1.8rem", - 9: "2.025rem", - 10: "2.25rem", - 11: "2.475rem", - 12: "2.7rem", - 16: "3.6rem", - 20: "4.5rem", - 24: "5.4rem", - 32: "7.2rem", - 40: "9rem", - 48: "10.8rem", - 56: "12.6rem", - 64: "14.4rem", - 72: "16.2rem", - 80: "18rem", - 96: "21.6rem", - }, - space: { - 0: "0", - 0.5: "0.1125rem", - 1: "0.225rem", - 1.5: "0.3375rem", - 2: "0.45rem", - 2.5: "0.5625rem", - 3: "0.675rem", - 3.5: "0.7875rem", - 4: "0.9rem", - 5: "1.125rem", - 6: "1.35rem", - 7: "1.575rem", - 8: "1.8rem", - 9: "2.025rem", - 10: "2.25rem", - 11: "2.475rem", - 12: "2.7rem", - 16: "3.6rem", - 20: "4.5rem", - 24: "5.4rem", - 32: "7.2rem", - 40: "9rem", - 48: "10.8rem", - 56: "12.6rem", - 64: "14.4rem", - 72: "16.2rem", - 80: "18rem", - 96: "21.6rem", - }, - gap: { - 0: "0", - 0.5: "0.1125rem", - 1: "0.225rem", - 1.5: "0.3375rem", - 2: "0.45rem", - 2.5: "0.5625rem", - 3: "0.675rem", - 3.5: "0.7875rem", - 4: "0.9rem", - 5: "1.125rem", - 6: "1.35rem", - 7: "1.575rem", - 8: "1.8rem", - 9: "2.025rem", - 10: "2.25rem", - 11: "2.475rem", - 12: "2.7rem", - 16: "3.6rem", - 20: "4.5rem", - 24: "5.4rem", - 32: "7.2rem", - 40: "9rem", - 48: "10.8rem", - 56: "12.6rem", - 64: "14.4rem", - 72: "16.2rem", - 80: "18rem", - 96: "21.6rem", - }, extend: { boxShadow: { "custom-shadow-2xs": "var(--color-shadow-2xs)", @@ -350,6 +213,144 @@ module.exports = { }, }, }), + + // scale down font sizes to 90% of default + fontSize: { + xs: "0.675rem", + sm: "0.7875rem", + base: "0.9rem", + lg: "1.0125rem", + xl: "1.125rem", + "2xl": "1.35rem", + "3xl": "1.6875rem", + "4xl": "2.25rem", + "5xl": "2.7rem", + "6xl": "3.375rem", + "7xl": "4.05rem", + "8xl": "5.4rem", + "9xl": "7.2rem", + }, + // scale down spacing to 90% of default + padding: { + 0: "0", + 0.5: "0.1125rem", + 1: "0.225rem", + 1.5: "0.3375rem", + 2: "0.45rem", + 2.5: "0.5625rem", + 3: "0.675rem", + 3.5: "0.7875rem", + 4: "0.9rem", + 5: "1.125rem", + 6: "1.35rem", + 7: "1.575rem", + 8: "1.8rem", + 9: "2.025rem", + 10: "2.25rem", + 11: "2.475rem", + 12: "2.7rem", + 16: "3.6rem", + 20: "4.5rem", + 24: "5.4rem", + 32: "7.2rem", + 40: "9rem", + 48: "10.8rem", + 56: "12.6rem", + 64: "14.4rem", + 72: "16.2rem", + 80: "18rem", + 96: "21.6rem", + }, + margin: { + 0: "0", + 0.5: "0.1125rem", + 1: "0.225rem", + 1.5: "0.3375rem", + 2: "0.45rem", + 2.5: "0.5625rem", + 3: "0.675rem", + 3.5: "0.7875rem", + 4: "0.9rem", + 5: "1.125rem", + 6: "1.35rem", + 7: "1.575rem", + 8: "1.8rem", + 9: "2.025rem", + 10: "2.25rem", + 11: "2.475rem", + 12: "2.7rem", + 16: "3.6rem", + 20: "4.5rem", + 24: "5.4rem", + 32: "7.2rem", + 40: "9rem", + 48: "10.8rem", + 56: "12.6rem", + 64: "14.4rem", + 72: "16.2rem", + 80: "18rem", + 96: "21.6rem", + }, + space: { + 0: "0", + 0.5: "0.1125rem", + 1: "0.225rem", + 1.5: "0.3375rem", + 2: "0.45rem", + 2.5: "0.5625rem", + 3: "0.675rem", + 3.5: "0.7875rem", + 4: "0.9rem", + 5: "1.125rem", + 6: "1.35rem", + 7: "1.575rem", + 8: "1.8rem", + 9: "2.025rem", + 10: "2.25rem", + 11: "2.475rem", + 12: "2.7rem", + 16: "3.6rem", + 20: "4.5rem", + 24: "5.4rem", + 32: "7.2rem", + 40: "9rem", + 48: "10.8rem", + 56: "12.6rem", + 64: "14.4rem", + 72: "16.2rem", + 80: "18rem", + 96: "21.6rem", + }, + gap: { + 0: "0", + 0.5: "0.1125rem", + 1: "0.225rem", + 1.5: "0.3375rem", + 2: "0.45rem", + 2.5: "0.5625rem", + 3: "0.675rem", + 3.5: "0.7875rem", + 4: "0.9rem", + 5: "1.125rem", + 6: "1.35rem", + 7: "1.575rem", + 8: "1.8rem", + 9: "2.025rem", + 10: "2.25rem", + 11: "2.475rem", + 12: "2.7rem", + 16: "3.6rem", + 20: "4.5rem", + 24: "5.4rem", + 32: "7.2rem", + 40: "9rem", + 48: "10.8rem", + 56: "12.6rem", + 64: "14.4rem", + 72: "16.2rem", + 80: "18rem", + 96: "21.6rem", + }, }, fontFamily: { custom: ["Inter", "sans-serif"],