From af717a0f231eae16291691813f30493edfd66829 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 11 Oct 2023 16:41:12 -0500 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 92390ca2e8e38ce08566c4df2053ff5102326e30 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Mon, 23 Oct 2023 16:42:41 -0500 Subject: [PATCH 8/9] Hotfix: Pull in djangocms-form fix for export bug (#354) * update core-cms image to pick up form export fix * fix django-meta dependency locking upstream * update cms image hash --------- Co-authored-by: Jake Rosenberg --- 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 35b0a7dfc..b64ee9cc3 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#707 (sans commits irrelevant to TACC) (v3.12.0-beta.4 candidate) -FROM taccwma/core-cms:1f7b95d +# TACC/Core-CMS#736 (cms-forms export hotfix) +FROM taccwma/core-cms:5ceecdd WORKDIR /code 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 9/9] 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 */