Resolving conflicts

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
 

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 */
 
 
 

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;
-}
-*/
+}

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 <mark> and a .u-highlight */
 
+/* TODO: Consider whether <mark> 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) {

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);
 

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

@@ -5,24 +5,21 @@
 /* … */
 
 /* GENERICS */
-@import url("./for-core-styles/generics/attributes.css") layer(base);
+/* … */
 
 /* ELEMENTS */
 /* … */
 
 /* 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);
 @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);
-@import url("./for-core-styles/components/c-update.css") layer(base);
 
 /* TRUMPS */
 @import url("./for-core-styles/trumps/u-highlight.css") layer(base);

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 */ {