From f587e04c9c3341462fbb210be15d256d5cc30140 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 31 Jul 2023 16:29:20 -0500 Subject: [PATCH 1/2] refactor: use core-styles v2.15, not form.cms.css --- .../auth/LoginComponent/LoginComponent.module.css | 7 +------ package-lock.json | 15 +++++++-------- package.json | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css index fc04abf23..2a28a6916 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css @@ -1,6 +1,3 @@ -/* So login form is built off CMS styles */ -@import url('@tacc/core-styles/dist/elements/form.cms.css') layer(base); - /* CONTAINER */ .root { @@ -54,10 +51,8 @@ display: none; } .field { - max-width: unset; /* undo forms.cms.css `input...` */ - /* To use larger field inputs, always (not just coarse pointer devices) */ - padding: 12px 12px; /* mimic forms.cms.css `@media (pointer: coarse)` */ + padding: 12px 12px; /* mimic Core Styles forms.css @media (pointer: coarse) */ } diff --git a/package-lock.json b/package-lock.json index 55f8812ae..e90364e25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@nrwl/vite": "^15.6.3", "@nrwl/web": "15.6.3", "@nrwl/workspace": "15.6.3", - "@tacc/core-styles": "^2.6.2", + "@tacc/core-styles": "^2.15.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "13.4.0", "@testing-library/user-event": "^14.4.3", @@ -5704,9 +5704,9 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", - "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.15.0.tgz", + "integrity": "sha512-zm9wNFemDLZpKPFfF2D0pVQqsbrNJMdf8T5VrEBm9cHA2c3fMFB7uV8RpKc4xrWVshYK7Z9pqqMw8WFrtL2zZQ==", "dev": true, "bin": { "core-styles": "src/cli.js" @@ -5724,7 +5724,6 @@ "postcss": "^8.4.18", "postcss-banner": "^4.0.1", "postcss-cli": "^10.0.0", - "postcss-env-function": "^4.0.6", "postcss-extend": "^1.0.5", "postcss-import": "^15.0.0", "postcss-preset-env": "^7.8.3", @@ -29588,9 +29587,9 @@ } }, "@tacc/core-styles": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", - "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.15.0.tgz", + "integrity": "sha512-zm9wNFemDLZpKPFfF2D0pVQqsbrNJMdf8T5VrEBm9cHA2c3fMFB7uV8RpKc4xrWVshYK7Z9pqqMw8WFrtL2zZQ==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index e74ae04c3..e071bc4c6 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@nrwl/vite": "^15.6.3", "@nrwl/web": "15.6.3", "@nrwl/workspace": "15.6.3", - "@tacc/core-styles": "^2.6.2", + "@tacc/core-styles": "^2.15.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "13.4.0", "@testing-library/user-event": "^14.4.3", From 92bac5bb63295803ec66e87b5412cef98ab6829f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 31 Jul 2023 17:11:30 -0500 Subject: [PATCH 2/2] chore: support core-styles v2.15 --- apps/tup-ui/src/main.global.css | 5 ++++ .../src/main.global.for-core-styles.css | 25 ------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css index 2eda1e4f3..920048111 100644 --- a/apps/tup-ui/src/main.global.css +++ b/apps/tup-ui/src/main.global.css @@ -7,6 +7,11 @@ /* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.14+ */ @import url("@tacc/core-styles/dist/trumps/s-affixed-input-wrapper.css"); +/* To use new form styles in core-styles.base.css */ +/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.15+ */ +@import url("@tacc/core-styles/dist/elements/form.css"); +@import url("@tacc/core-styles/dist/trumps/s-form.css"); + /* To overwrite @tacc/core-styles CEPv2 spacing */ :root { /* TACC/Core-Styles/blob/823b7b9/src/lib/_imports/settings/space.css */ diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css index 6d84d9f9b..e022907af 100644 --- a/apps/tup-ui/src/main.global.for-core-styles.css +++ b/apps/tup-ui/src/main.global.for-core-styles.css @@ -47,28 +47,3 @@ hr { :root { --global-color-danger--normal: #dc393b; } - -/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles with `s-form` */ -/* To mimic `c-form__field` layout */ -.s-form > div > label + input { - display: block; -} -.s-form > div + button { - display: block; - margin-top: 2rem; /* to mimic c-form__field margin-bottom */ -} -/* To mimic `c-form__help` */ -.s-form small { - display: block; - font-size: var(--global-font-size--small); - font-style: italic; -} -.s-form :not(ul,label) + small { - margin-top: 0.3em; -} -.s-form small > :not(details, a, samp) { - font-style: initial; -} -.s-affixed-input-wrapper.s-form small { - grid-area: help; -}