Revert "Merge branch 'feat/tup-463' into fix/tup-615-header-spacing-c…

…onsistency"

This reverts commit 0e222ee, reversing
changes made to d6215e3.

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#735 (cms-forms export hotfix)
+FROM taccwma/core-cms:5ceecdd
 
 WORKDIR /code
 

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/c-footer.css

@@ -0,0 +1,9 @@
+/* !!!: 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 (<p>) with minimal side effects */
+  display: flow-root;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.item.css

@@ -0,0 +1,6 @@
+/* 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;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.blog.app.page.css

@@ -1,5 +1,4 @@
 /* Media & Content - Alignment */
-/* TODO: Share relevant styles with c-news and c-feed-list */
 
 
 

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/django.cms.picture.css

@@ -0,0 +1,8 @@
+/* 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;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/components/lightgallery.css

@@ -0,0 +1,5 @@
+
+.lg-sub-html a {
+  /* FAQ: The `!important` overrides styles from plugin, in <anonymous> layer */
+  color: var(--global-color-link-on-dark--normal) !important;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/generics/pseudo-elements.css

@@ -0,0 +1,11 @@
+/* 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);
+    }
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css

@@ -0,0 +1,19 @@
+/* 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);
+}
+
+/* TODO: Remove from c-button (once it becomes redundant there) */
+/* FAQ: This is now added in generics/attributes.css */
+/*
+[disabled] {
+  pointer-events: none;
+}
+*/

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-card.css

@@ -0,0 +1,158 @@
+/* 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 <p> `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 */
+: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 */
+
+[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 */
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-content-block.css

@@ -0,0 +1,12 @@
+/* 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;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-pill.css

@@ -0,0 +1,64 @@
+/* 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. <h1> */
+  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;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-update.css

@@ -0,0 +1,10 @@
+.c-update__header {
+  display: flex;
+  align-items: baseline;
+}
+
+.c-update__title {
+  margin-right: 0.5em;
+
+  text-transform: uppercase;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css

@@ -0,0 +1,13 @@
+/* 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;
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-heading-steps.css

@@ -0,0 +1,15 @@
+/* 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);
+}

apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/objects/o-section.css

@@ -0,0 +1,14 @@
+/* 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;
+}