From 1646dde6e351d958e3c8847c37b2ef267e2b042a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 21 Sep 2023 11:51:20 -0500 Subject: [PATCH 01/36] chore: updates from core-cms blog styles to c-news --- .../css/for-core-styles/components/c-news--read.css | 10 +++++----- .../tup_cms/css/for-core-styles/components/c-news.css | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css index afe47e9a9..aa7781783 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news--read.css @@ -28,11 +28,11 @@ .c-news--read .c-news__header { grid-template-areas: - 'head' - 'subh' - 'cats' - 'tags' - 'attr'; + 'head head' + 'subh subh' + 'cats link' + 'tags tags' + 'attr attr'; } .c-news--read .c-news__title, .c-news--read .c-news__subtitle { diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css index 269790ff0..87b929e64 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css @@ -106,7 +106,7 @@ } /* To style tags as "pills" (the UI pattern) */ -.c-news__tags .tags a { +.c-news__tags a { /* TODO: When available in Core-Styles, uncomment this */ /* @extend :--c-pill; */ From af717a0f231eae16291691813f30493edfd66829 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 11 Oct 2023 16:41:12 -0500 Subject: [PATCH 02/36] docs: more css thoughts in comment --- .../static/tup_cms/css/for-core-styles/trumps/u-highlight.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css index b45c67bb7..ae6822c31 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css @@ -1,6 +1,9 @@ /* Highlight */ /* TODO: Create an .x-highlight used to extend a and a .u-highlight */ +/* TODO: Consider whether should be in Core-Styles… + Perhaps the client should decide what tag to use. */ +/* SEE: https://tacc-team.slack.com/archives/CQUA4D5KJ/p1696285622741979 */ mark, .x-highlight, :is(.u-highlight, .highlight) { From 6616d03f9739d8bd737c3ad41689281989431512 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 11 Oct 2023 16:45:41 -0500 Subject: [PATCH 03/36] docs: more css thoughts in comment --- .../css/for-core-cms/components/django.cms.blog.app.page.css | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.page.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.page.css index 972b7a854..50cf43e32 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.page.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.page.css @@ -1,4 +1,5 @@ /* Media & Content - Alignment */ +/* TODO: Share relevant styles with c-news and c-feed-list */ From d65bbf2363cbcbbdf79c0e1a016a381f9f0587cd Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:23:06 -0500 Subject: [PATCH 04/36] feat: tup-619 c-content block migration (#346) * feat: tup-619 c-content block migration * removed content-block import --- .../for-core-styles/components/c-content-block.css | 12 ------------ .../static/tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 13 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-content-block.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-content-block.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-content-block.css deleted file mode 100644 index d8d720c6c..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-content-block.css +++ /dev/null @@ -1,12 +0,0 @@ -/* FAQ: Used on TACC as `content-block` */ -/* SEE: https://dev.tup.tacc.utexas.edu/use-tacc/stem-evaluation-services/ */ - -:is(.c-content-block, .content-block) { - margin-bottom: var(--global-space--bootstrap-gap); - padding: var(--global-space--pattern-pad); -} - -:is(.c-content-block, .content-block) :is(h1, h2, h3, h4, h5, h6) { - border-left: var(--global-border-width--xx-thick) solid var(--global-color-accent--tertiary); - padding-left: 10px; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 8bfc4d0d6..8b54e141a 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -18,7 +18,6 @@ @import url("./for-core-styles/components/c-button.css") layer(base); @import url("./for-core-styles/components/c-card.css") layer(base); @import url("./for-core-styles/components/c-card--frontera-about-page.css") layer(base); -@import url("./for-core-styles/components/c-content-block.css") layer(base); @import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); @import url("./for-core-styles/components/c-pill.css") layer(base); From fd34bdc6e50ff5168ba695f9c8fc2f2ef9be8c35 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:26:30 -0500 Subject: [PATCH 05/36] feat: tup-623 c-update migration (#348) * migrated c-update to core-styles * removed c-update import --- .../css/for-core-styles/components/c-update.css | 10 ---------- .../static/tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 11 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-update.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-update.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-update.css deleted file mode 100644 index ed8c17e63..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-update.css +++ /dev/null @@ -1,10 +0,0 @@ -.c-update__header { - display: flex; - align-items: baseline; -} - -.c-update__title { - margin-right: 0.5em; - - text-transform: uppercase; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 8b54e141a..8aba3ed79 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -21,7 +21,6 @@ @import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); @import url("./for-core-styles/components/c-pill.css") layer(base); -@import url("./for-core-styles/components/c-update.css") layer(base); /* TRUMPS */ @import url("./for-core-styles/trumps/u-highlight.css") layer(base); From 65d0e0d33df27b61a51daf84c00be843075b897f Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:16:47 -0500 Subject: [PATCH 06/36] feat: tup-624: added generics/attributes to demo (#345) * feat: tup-624: added generics/attributes to demo * migrated rest of attributes.css to core-styles * removed unnecessary comments in css file for c-button --- .../css/for-core-styles/components/c-button.css | 10 +--------- .../css/for-core-styles/generics/attributes.css | 13 ------------- .../static/tup_cms/css/tup-cms.for-core-styles.css | 2 +- apps/tup-ui/src/main.global.for-core-styles.css | 10 ---------- 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css index 5b7a119b5..916af26ce 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css @@ -8,12 +8,4 @@ main > .container .c-button--is-active { /* FAQ: Design shows 10px font */ font-size: var(--global-font-size--x-small); -} - -/* TODO: Remove from c-button (once it becomes redundant there) */ -/* FAQ: This is now added in generics/attributes.css */ -/* -[disabled] { - pointer-events: none; -} -*/ +} \ No newline at end of file diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css deleted file mode 100644 index 5fc9012e1..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css +++ /dev/null @@ -1,13 +0,0 @@ -/* To render data-prefix value as prefixed text */ -[data-prefix]::before { - display: inline-block; - content: attr(data-prefix); - margin-right: 0.25ch; - - text-transform: none; -} - -/* TODO: Remove from c-button in Core-Styles */ -[disabled] { - pointer-events: none; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 8aba3ed79..3a222caaa 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -5,7 +5,7 @@ /* … */ /* GENERICS */ -@import url("./for-core-styles/generics/attributes.css") layer(base); +/* … */ /* ELEMENTS */ /* … */ 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 f54d0de31..f173dc2e2 100644 --- a/apps/tup-ui/src/main.global.for-core-styles.css +++ b/apps/tup-ui/src/main.global.for-core-styles.css @@ -44,16 +44,6 @@ hr { height: 16px; } -/* TODO: Remove this after: - 0. attributes.css is migrated to Core-Styles - 1. attributes.css is loaded by Portal */ -[data-prefix]::before { - display: inline-block; - content: attr(data-prefix); - margin-right: 0.25ch; - text-transform: none; -} - /* TODO: Remove this after: 0. CEP v2 colors are removed from Core-Styles settings/color--portal */ #page-portal main /* i.e. global-safe :root */ { From 9e9090794dd728923a62051577cc8bfafda257e8 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:36:47 -0500 Subject: [PATCH 07/36] feat/tup-625: Migrate o-heading-steps to core-styles (#349) --- .../for-core-styles/objects/o-heading-steps.css | 15 --------------- .../tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 16 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-heading-steps.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-heading-steps.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-heading-steps.css deleted file mode 100644 index 7eaa35853..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-heading-steps.css +++ /dev/null @@ -1,15 +0,0 @@ -/* To add numbers to steps */ -.heading-steps, -[class*="heading-steps--"] { - counter-reset: step; -} -.heading-steps :is(h1, h2, h3, h4, h5, h6), -[class*="heading-steps--"] :is(h1, h2, h3, h4, h5, h6) { - counter-increment: step; -} -.heading-steps--root :is(h1, h2, h3, h4, h5, h6)::before, -.heading-steps__item :is(h1, h2, h3, h4, h5, h6)::before { - content: counter(step) '. '; - color: var(--global-color-accent--secondary); - font-weight: var(--medium); -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 3a222caaa..6607c350c 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -12,7 +12,6 @@ /* OBJECTS */ @import url("./for-core-styles/objects/o-section.css") layer(base); -@import url("./for-core-styles/objects/o-heading-steps.css") layer(base); /* COMPONENTS */ @import url("./for-core-styles/components/c-button.css") layer(base); From caf95c05ec89def77637eb570af3a414918b3ef8 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:55:18 -0500 Subject: [PATCH 08/36] feat/tup-630: Migrate django.cms.blog.app.item (#351) * getting rid of django.cms.blog.app.item.css * removing the import for django.cms.blog.app.item.css --- .../for-core-cms/components/django.cms.blog.app.item.css | 6 ------ .../tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css | 1 - 2 files changed, 7 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.item.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.item.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.item.css deleted file mode 100644 index a395214e8..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.item.css +++ /dev/null @@ -1,6 +0,0 @@ -/* TODO: Share styles between c-news and c-feed-list (`time:not(…)`) */ -.blog-list article time:not(:is(h1, h2, h3, h4, h5, h6) *) { - color: var(--global-color-accent--secondary); - font-weight: var(--medium); - text-transform: uppercase; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css index abb78176a..0a7106cce 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css @@ -15,7 +15,6 @@ /* COMPONENTS */ @import url("./for-core-cms/components/c-footer.css") layer(project); -@import url("./for-core-cms/components/django.cms.blog.app.item.css") layer(project); @import url("./for-core-cms/components/django.cms.blog.app.page.css") layer(project); @import url("./for-core-cms/components/django.cms.picture.css") layer(project); @import url("./for-core-cms/components/lightgallery.css") layer(project); From fcd4dc4f519aed96df33bd7a6c3848a46221092d Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Thu, 2 Nov 2023 11:26:23 -0500 Subject: [PATCH 09/36] feat/tup-632: Migrate django.cms.picture.css to core-cms (#355) --- .../css/for-core-cms/components/django.cms.picture.css | 8 -------- .../tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css | 1 - 2 files changed, 9 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.picture.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.picture.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.picture.css deleted file mode 100644 index 4fb6ee0c5..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.picture.css +++ /dev/null @@ -1,8 +0,0 @@ -/* HELP: Why/How do I need to add these styles? */ -/* NOTE: There are Core Styles and Core CMS styles for image alignment. */ -/* SEE: https://www.tacc.utexas.edu/news/latest-news/2025/11/11/basic-news-template/?edit (styles below are not needed for figures) */ -/* SEE: https://www.tacc.utexas.edu/education/k-12-students/high-school-camps/gencyber-level-up/ (styles below are needed for images) */ -/* SEE: https://matcssi.tacc.utexas.edu/ (v3.11.1) (styles below not needed for image) */ -img.align-center { - display: block; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css index 0a7106cce..486381b59 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css @@ -16,7 +16,6 @@ /* COMPONENTS */ @import url("./for-core-cms/components/c-footer.css") layer(project); @import url("./for-core-cms/components/django.cms.blog.app.page.css") layer(project); -@import url("./for-core-cms/components/django.cms.picture.css") layer(project); @import url("./for-core-cms/components/lightgallery.css") layer(project); /* TRUMPS */ From a087d26518b1b7b2002ed1c7e83b4c0abf2c477c Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:35:35 -0500 Subject: [PATCH 10/36] Migrate c-card fixes to core-styles (#361) Co-authored-by: Wesley Bomar --- .../css/for-core-styles/components/c-card.css | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css index 5f8ccb54c..8c84ec886 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css @@ -1,29 +1,3 @@ -/* FIX CARD */ - -/* !!!: When migrated: - 1. Remove `:where(:not(…` (e.g. "not in portal"). - 2. Prevent these styles in apps/tup-ui TicketHistory CSS */ -:is(.card, .c-card, [class*="card--"]) p:last-child:where(:not(#page-portal *)) { - margin-bottom: 2rem; /* restore

`margin-bottom `*/ -} - -/* To more specifically control c-card link font weight */ -/* !!!: When migrated: - 1. Remove `:where(:not(…` (e.g. "not in portal"). - 2. Prevent these styles in apps/tup-ui TicketHistory CSS */ -:is(.card, .c-card, [class*="card--"]) a.c-button:where(:not(#page-portal *)) { - font-weight: var(--bold); -} - -/* FAQ: Used on image cards for staff like on /education/k-12-students/ */ -:is(.card, .c-card, [class*="card--"]) h4 { - margin-bottom: 0.375em; -} - - - - - /* SUPPORT LIST IN CARD */ /* FAQ: The Portal uses Bootstrap ".card" for ticket modal */ From fcb4a3e6cb22b0a1860ad38953867b6578eda71a Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:28:46 -0500 Subject: [PATCH 11/36] Migrated header to Core-Styles (#359) Co-authored-by: Wesley Bomar --- .../css/for-core-styles/trumps/s-header.css | 49 ------------------- .../tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 50 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/s-header.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/s-header.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/s-header.css deleted file mode 100644 index 821245264..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/s-header.css +++ /dev/null @@ -1,49 +0,0 @@ -/* NOTE: Minimal tweaks from Designer (in lieu of TACC/Core-CMS#222) */ -/* WARNING: Might conflict with TACC/Core-CMS#222 */ -.s-header { - font-size: var(--global-font-size--medium); - font-weight: var(--bold); - letter-spacing: 0.025px; /* 14px * 0.025em equals design-requested 0.35px */ -} - -/* To enlarge height for all screen widths */ -/* TODO: Change in Core-Styles */ -@media only screen and (min-width: 992px) { - .s-header { - height: 60px; - } -} - -/* To stretch nav items to header height (while retaining vertical centering) */ -/* TODO: Change in Core-Styles */ -.s-header, -.s-header .navbar-collapse { - align-items: stretch; -} -@media only screen and (min-width: 992px) { - .s-header .nav-item { - display: flex; - } -} -.s-header .nav-link { - display: flex; - align-items: center; -} -@media only screen and (min-width: 992px) { - .s-header[class*="navbar-expand-"] .navbar-nav .nav-link { - padding-block: 0; /* overwrite core-styles.header.css */ - } -} -.s-header .navbar-brand { - display: grid; - align-content: center; -} - -.s-header .dropdown-item:focus, -.s-header .dropdown-item:hover { - background-color: rgba(var(--global-color-primary--light-rgb), 0.3); -} -.s-header .dropdown-item.active, -.s-header .dropdown-item:active { - background-color: var(--global-color-accent--normal); -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index e3470b4fc..39375e306 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -23,4 +23,3 @@ /* TRUMPS */ @import url("./for-core-styles/trumps/u-highlight.css") layer(base); -@import url("./for-core-styles/trumps/s-header.css") layer(base); From 23b6fd8043b74204493c5125246be562d365f8b3 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:56:05 -0500 Subject: [PATCH 12/36] fix: tup-617 c-button font-weight redunant style (#364) From 88c0da4cfb260864773d87af3107fbb922c9d58c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 3 Nov 2023 18:18:16 -0500 Subject: [PATCH 13/36] feat(tup-cms): core-cms with core-styles v2.19 --- apps/tup-cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index b64ee9cc3..67f5bda0a 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#736 (cms-forms export hotfix) -FROM taccwma/core-cms:5ceecdd +# TACC/Core-CMS#742 (Core-Styles v2.11 to v2.19) +FROM taccwma/core-cms:7975138 WORKDIR /code From c7e5cd4286c4b612d78be83a961b44c397cd9d7c Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:45:52 -0500 Subject: [PATCH 14/36] chore: lowercase comment --- apps/tup-cms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 67f5bda0a..17ba7d02e 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,4 +1,4 @@ -# TACC/Core-CMS#742 (Core-Styles v2.11 to v2.19) +# TACC/Core-CMS#742 (core-styles v2.11 to v2.19) FROM taccwma/core-cms:7975138 WORKDIR /code From 65c88a99a6b8f5aed53b412213bfa669553aa308 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 3 Nov 2023 18:52:12 -0500 Subject: [PATCH 15/36] feat(tup-cms)!: core-cms with core-styles v2.19 WARNING: v2.17.3 causes login form field bug. --- package-lock.json | 17 ++++++++--------- package.json | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 760fe2841..e6855c77d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.16.3", + "@tacc/core-styles": "github:TACC/Core-Styles#v2.19.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,10 +5502,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.16.3.tgz", - "integrity": "sha512-xudj4QACQ2qsNdEPiLsa5CpdKKHOeuRW6bQd94WmYl3/1cSbPrZCHWloDfDqGMvxjKgNjUeCMjPG5yK3G4Jeyg==", + "version": "2.19.0", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#4743bcbfc261deb61a207791fa3a07915e23eb37", "dev": true, + "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -5515,7 +5515,7 @@ }, "peerDependencies": { "commander": "^9.4.1", - "cssnano": "^5.1.14", + "cssnano": "^5.1.15", "js-yaml": "^4.1.0", "merge-lite": "^1.0.2", "node-cmd": "^5.0.0", @@ -5525,7 +5525,7 @@ "postcss-extend": "^1.0.5", "postcss-import": "^15.0.0", "postcss-preset-env": "^7.8.3", - "postcss-replace": "^2.0.0" + "postcss-replace": "^2.0.1" } }, "node_modules/@tanstack/query-core": { @@ -25541,10 +25541,9 @@ } }, "@tacc/core-styles": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.16.3.tgz", - "integrity": "sha512-xudj4QACQ2qsNdEPiLsa5CpdKKHOeuRW6bQd94WmYl3/1cSbPrZCHWloDfDqGMvxjKgNjUeCMjPG5yK3G4Jeyg==", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#4743bcbfc261deb61a207791fa3a07915e23eb37", "dev": true, + "from": "@tacc/core-styles@github:TACC/Core-Styles#v2.19.0", "requires": {} }, "@tanstack/query-core": { diff --git a/package.json b/package.json index 0a1f39194..88ff68e50 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.16.3", + "@tacc/core-styles": "github:TACC/Core-Styles#v2.19.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", From aca968ff44603a238ec199fb7036171a48a1b174 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:51:38 -0600 Subject: [PATCH 16/36] feat/tup-634: Migrate pseudo-elements to core-cms (#358) --- .../css/for-core-cms/generics/pseudo-elements.css | 11 ----------- .../static/tup_cms/css/tup-cms.for-core-cms.css | 1 - 2 files changed, 12 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/generics/pseudo-elements.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/generics/pseudo-elements.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/generics/pseudo-elements.css deleted file mode 100644 index d2a5d9118..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/generics/pseudo-elements.css +++ /dev/null @@ -1,11 +0,0 @@ -/* To highlight targeted content */ -:target { - outline: var(--global-border-width--x-thick) solid transparent; - outline-offset: var(--global-border-width--xx-thick); - animation: focus 2s; -} -@keyframes focus { - from { - outline-color: var(--global-color-accent--tertiary); - } -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css index 486381b59..65cd6fb46 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css @@ -5,7 +5,6 @@ /* ... */ /* GENERICS */ -@import url("./for-core-cms/generics/pseudo-elements.css") layer(project); /* ELEMENTS */ /* … */ From 457c6c99bc7e315d2d8f2ce70168e218d76a069d Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:48:03 -0600 Subject: [PATCH 17/36] feat/tup-625: delete u-highlight stylesheet (#352) No need for u-highlight per jira ticket Co-authored-by: Wesley B <62723358+wesleyboar@users.noreply.github.com> --- .../css/for-core-styles/trumps/u-highlight.css | 16 ---------------- .../tup_cms/css/tup-cms.for-core-styles.css | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css deleted file mode 100644 index ae6822c31..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/trumps/u-highlight.css +++ /dev/null @@ -1,16 +0,0 @@ -/* Highlight */ -/* TODO: Create an .x-highlight used to extend a and a .u-highlight */ - -/* TODO: Consider whether should be in Core-Styles… - Perhaps the client should decide what tag to use. */ -/* SEE: https://tacc-team.slack.com/archives/CQUA4D5KJ/p1696285622741979 */ -mark, -.x-highlight, -:is(.u-highlight, .highlight) { - /* So wrapped inline text has consistent padding */ - -webkit-box-decoration-break: clone; - box-decoration-break: clone; -} -:is(h1, h2, h3, h4):is(.u-highlight, .highlight) { - display: inline; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 39375e306..c3fe08640 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -22,4 +22,4 @@ @import url("./for-core-styles/components/c-pill.css") layer(base); /* TRUMPS */ -@import url("./for-core-styles/trumps/u-highlight.css") layer(base); +/* … */ From 7da8bbbd24a3250e7a7d639955b21e3ae68c5c02 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:44:12 -0600 Subject: [PATCH 18/36] Migrate card list support to core-styles (#360) Co-authored-by: Wesley Bomar --- .../css/for-core-styles/components/c-card.css | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css index 8c84ec886..b5067fe27 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css @@ -1,25 +1,3 @@ -/* SUPPORT LIST IN CARD */ - -/* FAQ: The Portal uses Bootstrap ".card" for ticket modal */ -:is(.card, .c-card, [class*="card--"]) ul { - /* list-style: none; *//* H.P. restored bullets, M.S. does not know */ - padding-left: 1em; /* overwrite core-styles.cms */ -} -/* To add space between line items */ -/* FAQ: Using margin and li:not(:first-of-type) because of multi-line items */ -:is(.card, .c-card, [class*="card--"]) li:not(:first-of-type) { - margin-top: 0.5em; -} -/* TODO: Consider changing this site wide; SEE: -:where([role=main],main) li:not(td li) { line-height: 1.6; } */ -:is(.card, .c-card, [class*="card--"]) ul:last-child:where(:not(#page-portal *)) { - margin-bottom: 2rem; -} - - - - - /* ADD CARD--IMAGE */ /* Image */ From a67b3401d05050e883a13adab3cf6416c4ae271c Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:06:18 -0600 Subject: [PATCH 19/36] feat/tup-626: delete o-section from tup-ui (#353) * I believe this has already been merged into core-styles... Padding and Margin seem to be available on prod * remove import of core-styles o-heading-steps.css --- .../css/for-core-styles/objects/o-section.css | 14 -------------- .../static/tup_cms/css/tup-cms.for-core-styles.css | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-section.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-section.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-section.css deleted file mode 100644 index 0b6317fca..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-section.css +++ /dev/null @@ -1,14 +0,0 @@ -/* Remove double space */ -/* TODO: Integrate this into Core-Styles using less verbose solution */ -.section--light + .section--light, -.section--muted + .section--muted, -.section--dark + .section--dark, -.o-section--style-light + .o-section--style-light, -.o-section--style-muted + .o-section--style-muted, -.o-section--style-dark + .o-section--style-dark { - padding-top: unset; -} -.section:not([class*="section-"]) + .section:not([class*="section-"]), -.o-section:not([class*="section--"]) + .o-section:not([class*="section--"]) { - margin-top: unset; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index c3fe08640..b90c19267 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -11,7 +11,7 @@ /* … */ /* OBJECTS */ -@import url("./for-core-styles/objects/o-section.css") layer(base); +/* … */ /* COMPONENTS */ @import url("./for-core-styles/components/c-button.css") layer(base); From 474edafc6811495118ddadb2e27c31c59c917129 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:01:34 -0600 Subject: [PATCH 20/36] feat/tup-633: Migrate lightgallery to core-cms (#357) * feat/tup-633: Migrate lightgallery to core-cms * delete unnecessary import of django.cms.picture.css --- .../tup_cms/css/for-core-cms/components/lightgallery.css | 5 ----- .../tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css | 1 - 2 files changed, 6 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/lightgallery.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/lightgallery.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/lightgallery.css deleted file mode 100644 index 3a4330b0c..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/lightgallery.css +++ /dev/null @@ -1,5 +0,0 @@ - -.lg-sub-html a { - /* FAQ: The `!important` overrides styles from plugin, in layer */ - color: var(--global-color-link-on-dark--normal) !important; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css index 65cd6fb46..55484cc71 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css @@ -15,7 +15,6 @@ /* COMPONENTS */ @import url("./for-core-cms/components/c-footer.css") layer(project); @import url("./for-core-cms/components/django.cms.blog.app.page.css") layer(project); -@import url("./for-core-cms/components/lightgallery.css") layer(project); /* TRUMPS */ /* … */ From 032bfd27ac8c255dfc3729c45eee10def7aba3cb Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:06:55 -0600 Subject: [PATCH 21/36] feat/tup-629: delete footer (#356) * feat/tup-629: delete footer Footer is already in core-styles and cms * remove unnecessary imports --- .../tup_cms/css/for-core-cms/components/c-footer.css | 9 --------- .../tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css | 1 - 2 files changed, 10 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/c-footer.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/c-footer.css deleted file mode 100644 index 3460761c0..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/c-footer.css +++ /dev/null @@ -1,9 +0,0 @@ -/* !!!: Some or all of this may be moot since TACC/Core-Styles/pull/215 */ -.c-footer { - /* TODO: Remove padding-top from core-styles.cms.css (then remove this) */ - padding-top: 0; - - /* TODO: Add comment+style below to core-styles.cms.css (then remove this) */ - /* To prevent margin-collapse of children (

) with minimal side effects */ - display: flow-root; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css index 55484cc71..3054dfcae 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-cms.css @@ -13,7 +13,6 @@ /* … */ /* COMPONENTS */ -@import url("./for-core-cms/components/c-footer.css") layer(project); @import url("./for-core-cms/components/django.cms.blog.app.page.css") layer(project); /* TRUMPS */ From 960194f2ebed994c1bf4fc8cd602b3d69c162d2a Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Mon, 6 Nov 2023 14:42:41 -0600 Subject: [PATCH 22/36] removing all card--image styles (#365) --- .../css/for-core-styles/components/c-card.css | 110 ------------------ 1 file changed, 110 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css index b5067fe27..e69de29bb 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css @@ -1,110 +0,0 @@ -/* ADD CARD--IMAGE */ - -/* Image */ - -[class*="card--image-"] { - display: grid; -} - -.card--image-top { - padding-top: 0; -} -.card--image-left { - padding-left: 0; - padding-bottom: var(--global-space--pattern-pad); -} -.card--image-right { - padding-right: 0; - padding-bottom: var(--global-space--pattern-pad); -} -.card--image-bottom { - padding-bottom: 0; -} - - - -/* Image: Left & Right */ - -.card--image-left, -.card--image-right { - --image-width: 50%; - - grid-column-gap: var(--global-space--pattern-pad); - - /* Repeat many times, because element count is unknown */ - grid-template-rows: repeat(10, min-content); -} -.card--image-left > img, -.card--image-right > img { - grid-row-start: 1; - grid-row-end: -1; - - /* To remove card padding */ - margin-block: calc( -1 * var(--global-space--pattern-pad) ); -} - -.card--image-left { - grid-template-columns: var(--image-width) 1fr; /* to overwrite `.c-card` */ -} -.card--image-left > img { - grid-column-start: 1; - grid-column-end: span 1; -} - -.card--image-right { - grid-template-columns: 1fr var(--image-width); /* to overwrite `.c-card` */ -} -.card--image-right > img { - grid-column-start: 2; - grid-column-end: span 1; -} - - - -/* Image: Top & Bottom */ - -.card--image-top, -.card--image-bottom { - --image-height: auto; - --global-space--pattern-pad: 15px; - - /* Use extra columns to add horizontal padding */ - grid-template-columns: var(--global-space--pattern-pad) 1fr var(--global-space--pattern-pad); - padding-inline: unset; -} -.card--image-top > :not(img), -.card--image-bottom > :not(img) { - /* Span only columns for content */ - grid-column-start: 2; - grid-column-end: -2; -} -.card--image-top > img, -.card--image-bottom > img { - /* Span all columns, padding and content */ - grid-column-start: 1; - grid-column-end: -1; -} - -.card--image-top { - /* Repeat many times, because element count is unknown */ - grid-template-rows: repeat(10, min-content) var(--image-height); -} -.card--image-top > img { - grid-row-start: 1; - margin-bottom: var(--global-space--pattern-pad); -} -.card--image-bottom > :is(h1, h2, h3, h4, h5):first-of-type { - margin-top: unset; /* to avoid combining margin with image */ -} - -.card--image-bottom { - /* Repeat many times, because element count is unknown */ - grid-template-rows: var(--image-height) repeat(10, min-content); -} -.card--image-bottom > img { - grid-row-end: -1; - margin-top: var(--global-space--pattern-pad); -} -.card--image-bottom > p:last-of-type { - margin-bottom: unset; /* to avoid combining margin with image */ -} From 0dcd2ca6f7cda95fb688b9e8a3a13c20d0ef8fb0 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:39:16 -0600 Subject: [PATCH 23/36] chore: tup-616 migrate c-button styles to core-cms (#343) * chore: migrate c-button styles to core-cms https://github.com/TACC/Core-CMS/pull/729 * fix: remove import of file deleted in merge --------- Co-authored-by: Tomas Gonzalez --- .../css/for-core-styles/components/c-button.css | 11 ----------- .../static/tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 12 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css deleted file mode 100644 index 916af26ce..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css +++ /dev/null @@ -1,11 +0,0 @@ -/* TODO: When migrated to Core, remove `main > .container` (i.e. "in CMS") */ -main > .container .c-button--primary, -main > .container .c-button--secondary, -main > .container .c-button--tertiary, -main > .container .c-button--is-active { - /* FAQ: Design looks like 10px 20px, but M.S. requests more */ - padding: 10px 30px; - - /* FAQ: Design shows 10px font */ - font-size: var(--global-font-size--x-small); -} \ No newline at end of file diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index b90c19267..02247194c 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -14,7 +14,6 @@ /* … */ /* COMPONENTS */ -@import url("./for-core-styles/components/c-button.css") layer(base); @import url("./for-core-styles/components/c-card.css") layer(base); @import url("./for-core-styles/components/c-content-block.css") layer(base); @import url("./for-core-styles/components/c-feed-list.css") layer(base); From b0d490b6d8dd756177a98d75018156ee4bc04121 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:07:33 -0600 Subject: [PATCH 24/36] feat/tup-622 migrate c-pill to core-styles (#367) --- .../css/for-core-styles/components/c-pill.css | 64 ------------------- .../tup_cms/css/tup-cms.for-core-styles.css | 1 - 2 files changed, 65 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-pill.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-pill.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-pill.css deleted file mode 100644 index b04d75ca4..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-pill.css +++ /dev/null @@ -1,64 +0,0 @@ -/* TODO: When integrated into Core-Styles, uncomment this */ -/* @import url('../settings/color.css'); */ - -/* Base */ - -.c-pill { - font-weight: var(--medium); - font-size: var(--global-font-size--x-small); - - display: inline-block; /* FAQ: Supports `min/max-width` */ - padding-inline: 0.75em; - min-width: 6.5em; - - line-height: 1.4; - text-align: center; - text-transform: none; /* avoid inheritance form context e.g.

*/ - border-radius: 0.5em; - color: var(--global-color-primary--xx-dark); -} - - - -/* Modifiers */ - -/* Modifiers - Structure */ - -/* CAVEAT: This alone may not trigger truncation */ -/* SEE: https://confluence.tacc.utexas.edu/x/sAoFDg */ -.c-pill--should-truncate { - max-width: 100%; - - overflow: hidden; - text-overflow: ellipsis; - /* white-space: nowrap; */ /* FAQ: Let client decide */ - - /* Keep alignment that is changed by `overflow: hidden;` */ - /* SEE: https://stackoverflow.com/q/25818199 */ - vertical-align: bottom; -} - - - -/* Modifiers */ - -/* Modifiers - Skin */ - -.c-pill--is-danger { - background-color: var(--global-color-danger--light); -} -.c-pill--is-success { - background-color: var(--global-color-success--normal); -} -.c-pill--is-warning { - background-color: var(--global-color-warning--normal); -} -.c-pill--is-normal { - background-color: var(--global-color-extra--light); -} -.c-pill--is-fixed { - background-color: var(--global-color-primary--light); -} -.c-pill--is-updated { - background-color: #FFF500; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 02247194c..9f69eee66 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -18,7 +18,6 @@ @import url("./for-core-styles/components/c-content-block.css") layer(base); @import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); -@import url("./for-core-styles/components/c-pill.css") layer(base); /* TRUMPS */ /* … */ From d33b9768c143944411ce52fab240f04bc85e35af Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:37:07 -0600 Subject: [PATCH 25/36] feat/tup-640 Delete c-card and c-content-block imports (#368) --- .../static/tup_cms/css/for-core-styles/components/c-card.css | 0 .../tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 9f69eee66..661def38b 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -14,8 +14,6 @@ /* … */ /* COMPONENTS */ -@import url("./for-core-styles/components/c-card.css") layer(base); -@import url("./for-core-styles/components/c-content-block.css") layer(base); @import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); From 1b0dd2804432aa9fd7212d6113c18f1f079fbdbb Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 13 Nov 2023 11:12:42 -0600 Subject: [PATCH 26/36] feat(tup-cms): core-cms with core-styles v2.20 WARNING: Introduces login form field width bug. (Core-Styles v2.17.3 might be the cause.) --- apps/tup-cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 17ba7d02e..787f95e14 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#742 (core-styles v2.11 to v2.19) -FROM taccwma/core-cms:7975138 +# TACC/Core-CMS#742 (core-styles v2.11 to v2.20; migrate css to core-cms|styles) +FROM taccwma/core-cms:82454ef WORKDIR /code From 3167014a8ae8c08794ff15b23d27644ebccf03cb Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 13 Nov 2023 11:47:03 -0600 Subject: [PATCH 27/36] feat(tup-ui): core-styles v2.20 --- package-lock.json | 13 +++++++------ package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6855c77d..d31cb5a78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#v2.19.0", + "@tacc/core-styles": "^2.20.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,10 +5502,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.19.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#4743bcbfc261deb61a207791fa3a07915e23eb37", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.20.0.tgz", + "integrity": "sha512-vk9F2V0ZTZXDsIvOhAPh1XHTadlnpwSfBFVX5bJoqvQ18cgEwSX7LU0Wj1er3VK/iL0wdDVOIgl/vmgKpGkO+Q==", "dev": true, - "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -25541,9 +25541,10 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#4743bcbfc261deb61a207791fa3a07915e23eb37", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.20.0.tgz", + "integrity": "sha512-vk9F2V0ZTZXDsIvOhAPh1XHTadlnpwSfBFVX5bJoqvQ18cgEwSX7LU0Wj1er3VK/iL0wdDVOIgl/vmgKpGkO+Q==", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#v2.19.0", "requires": {} }, "@tanstack/query-core": { diff --git a/package.json b/package.json index 88ff68e50..f515f38c4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#v2.19.0", + "@tacc/core-styles": "^2.20.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", From 90163f68b4c68f8773d4f55726b8301f5ec76fe0 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 16 Nov 2023 14:28:57 -0600 Subject: [PATCH 28/36] feat(tup-cms): core-styles v2.21 + via core-cms --- apps/tup-cms/Dockerfile | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 787f95e14..4462a8317 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#742 (core-styles v2.11 to v2.20; migrate css to core-cms|styles) -FROM taccwma/core-cms:82454ef +# TACC/Core-CMS#742 (core-styles v2.11 to v2.21; migrate css to core-cms|styles) +FROM taccwma/core-cms:71a23d3 WORKDIR /code diff --git a/package-lock.json b/package-lock.json index d31cb5a78..47c2b0282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.20.0", + "@tacc/core-styles": "^2.21.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,9 +5502,9 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.20.0.tgz", - "integrity": "sha512-vk9F2V0ZTZXDsIvOhAPh1XHTadlnpwSfBFVX5bJoqvQ18cgEwSX7LU0Wj1er3VK/iL0wdDVOIgl/vmgKpGkO+Q==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.0.tgz", + "integrity": "sha512-KntuL1JKt3PA1h3XoesdlrUEmHNtRqFGk8mIkx3Lb8fzXJZOzaCwPmfTLnxx9MpuSgdl6WPBFvbUjRP4gop4zg==", "dev": true, "bin": { "core-styles": "src/cli.js" @@ -25541,9 +25541,9 @@ } }, "@tacc/core-styles": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.20.0.tgz", - "integrity": "sha512-vk9F2V0ZTZXDsIvOhAPh1XHTadlnpwSfBFVX5bJoqvQ18cgEwSX7LU0Wj1er3VK/iL0wdDVOIgl/vmgKpGkO+Q==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.0.tgz", + "integrity": "sha512-KntuL1JKt3PA1h3XoesdlrUEmHNtRqFGk8mIkx3Lb8fzXJZOzaCwPmfTLnxx9MpuSgdl6WPBFvbUjRP4gop4zg==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index f515f38c4..65dc01ca1 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.20.0", + "@tacc/core-styles": "^2.21.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", From 0d076a3c676e304fde954a8caf10e7ba23df8514 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:51:49 -0600 Subject: [PATCH 29/36] feat: tup 648 do not use plain highlight class (#370) * feat: tup-648 do not use plain highlight class * feat: tup-648 do not use plain highlight class --- .../src/taccsite_cms/templates/snippets/css-banner-tacc.html | 2 +- .../static/tup_cms/css/for-tup-cms/components/banner.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html index 7680f2d82..6ef15a6d0 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html @@ -23,7 +23,7 @@ left: 0; top: 0; bottom: 0; right: 0; background-color: var(--global-color-primary--x-light); } -.banner-cell--major a:hover .highlight { +.banner-cell--major a:hover .u-highlight { background-color: var(--global-color-accent--normal); } diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/banner.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/banner.css index 747f85ef9..31f1cb6ef 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/banner.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/banner.css @@ -73,7 +73,7 @@ margin-bottom: 2.0rem; } -[class*="banner-cell--"] .highlight { +[class*="banner-cell--"] .u-highlight { padding-inline: var(--tag-padding); color: var(--global-color-primary--xx-light); From 0de4c1198b99283670a372a30effd9d49eb87e8f Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <63771558+R-Tomas-Gonzalez@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:37:59 -0600 Subject: [PATCH 30/36] bug/tup-650: Resetting (unset) padding-block from cms (#371) * bug/tup-650: Remove padding-block from cms * adjusted comments to relative code blocks --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index f237ae6b9..217ac6cfd 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -168,12 +168,15 @@ html:not(#page-portal) #portal-footer /* trans id */ { /* PER CLIENT - PORTAL */ -/* To add a full-width border above CMS footer */ -/* TODO: Evaluate for tup-ui or Core-CMS CSS */ html:not(#page-portal) .c-footer { + /* To add a full-width border above CMS footer */ + /* TODO: Evaluate for tup-ui or Core-CMS CSS */ border-width: var(--global-border-width--thick) 0 0 0; border-style: solid; border-color: var(--global-color-secondary--light); + + /* To remove padding-block on CMS footer */ + padding-block: unset; } /* To reduce size of Portal footer */ From 4560e3bc5591388f99908b00bfa02f7ad4e34cf9 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:42:30 -0600 Subject: [PATCH 31/36] fix: tup-654 use c-form--login from core-styles (#374) * fix: tup-654 use c-form--login from core-styles * chore: tup-654 remove redundant `c-form` classname --- apps/tup-ui/src/main.global.css | 3 +++ .../tup-components/src/auth/LoginComponent/LoginComponent.tsx | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css index fa739a14f..eaa3ca7f5 100644 --- a/apps/tup-ui/src/main.global.css +++ b/apps/tup-ui/src/main.global.css @@ -12,6 +12,9 @@ @import url("@tacc/core-styles/dist/elements/form.css"); @import url("@tacc/core-styles/dist/trumps/s-form.css"); +/* To use login form styles */ +@import url('@tacc/core-styles/dist/components/c-form--login.css'); + /* To overwrite @tacc/core-styles CEPv2 spacing */ #page-portal main /* i.e. global-safe :root */ { /* TACC/Core-Styles/blob/823b7b9/src/lib/_imports/settings/space.css */ diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index 5520649b4..bd6b9ee86 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -114,7 +114,7 @@ const LoginComponent: React.FC = ({ className }) => { const status = (error as AxiosError)?.response?.status; return ( -
+

TACC Logo Log In @@ -123,7 +123,7 @@ const LoginComponent: React.FC = ({ className }) => { to continue to the TACC User Portal

-
+ Date: Mon, 20 Nov 2023 17:42:42 -0600 Subject: [PATCH 32/36] chore: tup-463 remove temp. core-styles imports (#375) Some Core-Styles were loaded via CDN, cuz CMS did not have latest yet. Now CMS has much more recent Core-Styles, so use them. Do not duplicate. --- apps/tup-ui/src/main.global.css | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css index eaa3ca7f5..730529f6f 100644 --- a/apps/tup-ui/src/main.global.css +++ b/apps/tup-ui/src/main.global.css @@ -1,17 +1,3 @@ -/* To use new c-nav component not yet in TACC/Core-CMS core-styles.base.css */ -/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.13+ */ -/* CAVEAT: Duplicates older, unchanged, global c-nav styles */ -@import url("@tacc/core-styles/dist/components/c-nav.css"); - -/* To use s-affixed-input-wrapper which had been unused outside TACC/Core-CMS */ -/* 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 use login form styles */ @import url('@tacc/core-styles/dist/components/c-form--login.css'); From b93cfce427eca1b1d3a74115492149c3d0cd0fe2 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:46:19 -0600 Subject: [PATCH 33/36] enhance: tup-463 login component should use core-styles (#376) * chore: tup-463 remove temp. core-styles imports Some Core-Styles were loaded via CDN, cuz CMS did not have latest yet. Now CMS has much more recent Core-Styles, so use them. Do not duplicate. * chore: tup-463 delete css modules mimicking core Some Core-Styles CSS was added after TUP login form was developed. Now that it is available, TUP lofin form can use it. Less module CSS! * style: npx nx format:write --- .../LoginComponent/LoginComponent.module.css | 92 +------------------ .../auth/LoginComponent/LoginComponent.tsx | 28 ++---- 2 files changed, 11 insertions(+), 109 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css index 2a28a6916..1d1bbe130 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css @@ -1,97 +1,11 @@ -/* CONTAINER */ - -.root { - font-size: 1.6rem; - font-family: var(--global-font-family--sans--cms); -} - - - -/* LINKS */ - -.link { - font-weight: var(--medium); -} - - - -/* TITLE */ - -.title, -.subtitle { - text-align: center; - color: var(--global-color-primary--xx-dark); -} -.title { - font-size: 2.4rem; - font-weight: var(--black); -} -.subtitle { - font-size: 1.6rem; -} - -.logo { - display: block; /* to collapse margins with heading */ - margin-inline: auto; /* to re-center image */ - height: 75px; - margin-bottom: 45px; -} - -.subtitle { - font-weight: var(--medium); /* mimics value (not appearance) from design */ - margin-block: 25px; /* mimics django-cms-forms.css `.description` */ -} - - - -/* FORM */ - /* To hide "(required)" (which is an obvious attribute on a login form) */ +/* FAQ: Core-Styles does this for `c-form--star` but not Bootstrap's `badge` */ .root label :global(.badge) { display: none; } -.field { - /* To use larger field inputs, always (not just coarse pointer devices) */ - padding: 12px 12px; /* mimic Core Styles forms.css @media (pointer: coarse) */ -} - - - -.submit { - padding-block: 10px; /* overrides core-styles.base.css button styles */ -} - -.submit-container { - display: flex; - justify-content: space-between; - align-items: center; -} - - - -/* FOOTER */ - -.footer { - display: flex; - flex-direction: column; - align-items: flex-end; - gap: 12px; - - margin-top: 35px; /* mimics django-cms-forms.css `.button-wrapper` */ -} -.footer > p { - margin-block: 0; /* overwrite browser */ -} - - -/* ERRORS */ - -.error { - margin-bottom: 2rem; /* TODO: move to @tacc/core-styles */ -} /* When (the only known) error would wrap, move all lines to one line */ @media screen and (max-width: 435px) { - .error br { content: ""; } /* to remove new line */ - .error br::after { content: " "; } /* to add space */ + .root :global(.c-form-errors) br { content: ""; } /* to remove new line */ + .root :global(.c-form-errors) br::after { content: " "; } /* to add space */ } diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index bd6b9ee86..753694b5e 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -26,7 +26,7 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ } if (status === 403) { return ( -
+
Sorry, we can't find an account matching those credentials.
Please try again or create a new account. @@ -34,7 +34,7 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ ); } return ( -
+
Sorry. Something went wrong while trying to log in. Please try again later.
@@ -46,19 +46,13 @@ const CreateAccountLink = () => ( href="https://accounts.tacc.utexas.edu/register" target="_blank" rel="noreferrer" - className={styles.link} > Create Account ); const AccountHelpLink = () => ( - + Account Help ); @@ -68,7 +62,6 @@ const ResetPasswordLink = () => ( href="https://accounts.tacc.utexas.edu/forgot_password" target="_blank" rel="noreferrer" - className={styles.link} > Reset Password @@ -115,13 +108,11 @@ const LoginComponent: React.FC = ({ className }) => { return (
-

- TACC Logo +

+ TACC Logo Log In

-

- to continue to the TACC User Portal -

+

to continue to the TACC User Portal

@@ -129,7 +120,6 @@ const LoginComponent: React.FC = ({ className }) => { name="username" label="User Name" type="text" - className={styles.field} autoComplete="username" required /> @@ -137,17 +127,15 @@ const LoginComponent: React.FC = ({ className }) => { name="password" label="Password" type="password" - className={styles.field} autoComplete="current-password" required /> -
+
-
+

Having trouble logging in?

From cc7763b81df0e49cb2f0c155bb2a6a09709fdf9b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:07:22 -0600 Subject: [PATCH 34/36] chore: tup-463 delete css modules mimicking core (#377) Some Core-Styles CSS was added after TUP login page was developed. Now that it is available, TUP login page can use it. Less module CSS! --- apps/tup-ui/src/pages/Login/Login.module.css | 50 -------------------- apps/tup-ui/src/pages/Login/Login.tsx | 21 +++----- 2 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 apps/tup-ui/src/pages/Login/Login.module.css diff --git a/apps/tup-ui/src/pages/Login/Login.module.css b/apps/tup-ui/src/pages/Login/Login.module.css deleted file mode 100644 index 821d9a5a0..000000000 --- a/apps/tup-ui/src/pages/Login/Login.module.css +++ /dev/null @@ -1,50 +0,0 @@ -@import url('@tacc/core-styles/src/lib/_imports/tools/media-queries.css'); - -.root { - padding-block: var(--global-space--section-gap); -} - -.footer__link { - font-weight: var(--bold); -} - -.body, -.footer { - width: 100%; - max-width: 630px; - - margin-inline: auto; -} - -.body { - padding: 50px; - - border: var(--global-border--normal); - border-color: var(--global-color-primary--dark); - background-color: var(--global-color-primary--xx-light); - - /* To remove left+right borders when form hits page edge */ - @media (width <= 630px) { - border-inline: 0; - } -} - -.footer { - display: flex; - gap: 1.5em; - margin-top: var(--global-space--normal); - - font-family: var(--global-font-family--sans--cms); - font-size: var(--global-font-size--small); - font-weight: var(--bold); - - @media (--narrow-and-below) { - justify-content: center; - } - @media (--narrow-and-above) { - justify-content: flex-end; - } -} -.footer a { - color: var(--global-color-primary--x-dark); -} diff --git a/apps/tup-ui/src/pages/Login/Login.tsx b/apps/tup-ui/src/pages/Login/Login.tsx index b0d278a48..c0803d3fb 100644 --- a/apps/tup-ui/src/pages/Login/Login.tsx +++ b/apps/tup-ui/src/pages/Login/Login.tsx @@ -1,23 +1,14 @@ import React from 'react'; import { LoginComponent } from '@tacc/tup-components'; -import styles from './Login.module.css'; - const Layout: React.FC = () => { return ( -
- - +
+ +
); }; From 7e11f1044e69246932d1f637766084ff4b42b386 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 20 Nov 2023 19:05:32 -0600 Subject: [PATCH 35/36] feat: core-styles v2.21.0 to v2.21.1 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47c2b0282..7ad363cff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.21.0", + "@tacc/core-styles": "^2.21.1", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,9 +5502,9 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.0.tgz", - "integrity": "sha512-KntuL1JKt3PA1h3XoesdlrUEmHNtRqFGk8mIkx3Lb8fzXJZOzaCwPmfTLnxx9MpuSgdl6WPBFvbUjRP4gop4zg==", + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.1.tgz", + "integrity": "sha512-pXNR96h6pWY+d4RLQiDimtV7cfsaa2BlBahML3hxiA5li8AKqqa5+vvHfOk/va3Bqy05nPSfDHssD42fkosEcA==", "dev": true, "bin": { "core-styles": "src/cli.js" @@ -25541,9 +25541,9 @@ } }, "@tacc/core-styles": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.0.tgz", - "integrity": "sha512-KntuL1JKt3PA1h3XoesdlrUEmHNtRqFGk8mIkx3Lb8fzXJZOzaCwPmfTLnxx9MpuSgdl6WPBFvbUjRP4gop4zg==", + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.21.1.tgz", + "integrity": "sha512-pXNR96h6pWY+d4RLQiDimtV7cfsaa2BlBahML3hxiA5li8AKqqa5+vvHfOk/va3Bqy05nPSfDHssD42fkosEcA==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index 65dc01ca1..0afa7e370 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "^2.21.0", + "@tacc/core-styles": "^2.21.1", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", From bee6a465aeb3e4354e9ea5a05907969a18eebcf2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 20 Nov 2023 19:05:45 -0600 Subject: [PATCH 36/36] feat: core-cms, core-styles v2.21.0 to v2.21.1 --- apps/tup-cms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 4462a8317..705e6a1e9 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ # TACC/Core-CMS#742 (core-styles v2.11 to v2.21; migrate css to core-cms|styles) -FROM taccwma/core-cms:71a23d3 +FROM taccwma/core-cms:c532ee4 WORKDIR /code