Skip to content

refactor: use core-styles v2.15, not form.cms.css #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesleyboar merged 3 commits into from
Jul 31, 2023
Merged

refactor: use core-styles v2.15, not form.cms.css #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f587e04
refactor: use core-styles v2.15, not form.cms.css
wesleyboar Jul 31, 2023
3b24998
Merge branch 'task/TUP-517--mfa-ui-tweaks--design-changes' into refac…
wesleyboar Jul 31, 2023
92bac5b
chore: support core-styles v2.15
wesleyboar Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/tup-ui/src/main.global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
25 changes: 0 additions & 25 deletions apps/tup-ui/src/main.global.for-core-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
7 changes: 1 addition & 6 deletions libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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) */
}


Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@nrwl/vite": "^15.6.3",
"@nrwl/web": "15.6.3",
"@nrwl/workspace": "15.6.3",
"@tacc/core-styles": "^2.14.0",
"@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",
Expand Down