From 2b3c96e37c940e9edd78ff271f4ebe8c9b19fa12 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jan 2024 14:19:57 -0600 Subject: [PATCH 1/5] test(ecep): irregular-links via core-styles --- ecep_cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile index 59096a3d..6cb853e0 100644 --- a/ecep_cms/Dockerfile +++ b/ecep_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#743 (v4.2.0 candidate) -FROM taccwma/core-cms:7cfefff +# TACC/Core-CMS#782 (v4.4.0+) +FROM taccwma/core-cms:c82d56f WORKDIR /code From d088cbd9d7a35982061eb4c5f48df12a42f6b616 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jan 2024 17:18:45 -0600 Subject: [PATCH 2/5] Revert "test(ecep): irregular-links via core-styles" This reverts commit 2b3c96e37c940e9edd78ff271f4ebe8c9b19fa12. --- ecep_cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile index 6cb853e0..59096a3d 100644 --- a/ecep_cms/Dockerfile +++ b/ecep_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#782 (v4.4.0+) -FROM taccwma/core-cms:c82d56f +# TACC/Core-CMS#743 (v4.2.0 candidate) +FROM taccwma/core-cms:7cfefff WORKDIR /code From fd5947af6eca4ed1f3bc102e6291471104166f99 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jan 2024 17:20:12 -0600 Subject: [PATCH 3/5] test(demdata): CMS v4+ --- demdata_cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demdata_cms/Dockerfile b/demdata_cms/Dockerfile index 09e63639..6cb853e0 100644 --- a/demdata_cms/Dockerfile +++ b/demdata_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.12.0-beta.2 -FROM taccwma/core-cms:55db2ed +# TACC/Core-CMS#782 (v4.4.0+) +FROM taccwma/core-cms:c82d56f WORKDIR /code From cdd8b18d40bf1957400de98f2757f00a65b3ab47 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jan 2024 17:39:55 -0600 Subject: [PATCH 4/5] test(demdata): irregular-links via core-styles --- .../demdata_cms/templates/fullwidth.html | 2 ++ .../from-ecep-cms/site-css-links.html | 28 ------------------- .../demdata_cms/templates/standard.html | 2 ++ 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html index c0f92047..002d4b85 100644 --- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html +++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html @@ -1,6 +1,8 @@ {% extends "fullwidth.html" %} {% load cms_tags %} +{% block page_type_class %}s-irregular-links{% endblock page_type_class %} + {% block assets_custom %} {{ block.super }} diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html deleted file mode 100644 index 831b52f0..00000000 --- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html +++ /dev/null @@ -1,28 +0,0 @@ -{# https://github.com/TACC/Core-Styles/blob/511c870/src/lib/_imports/trumps/s-irregular-links.css #} -{# https://github.com/TACC/Core-Styles/blob/511c870/src/lib/_imports/tools/x-link.css #} - diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html index f1cf9e22..0f05d175 100644 --- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html +++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html @@ -1,6 +1,8 @@ {% extends "standard.html" %} {% load cms_tags %} +{% block page_type_class %}s-irregular-links{% endblock page_type_class %} + {% block assets_custom %} {{ block.super }} From 1033636b786d056efb38e842ea42ca99d787c3d9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 5 Jan 2024 17:48:55 -0600 Subject: [PATCH 5/5] fix(demdata): irregular-links via core-styles --- .../src/taccsite_custom/demdata_cms/templates/assets_custom.html | 1 - 1 file changed, 1 deletion(-) diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html index 2270171c..f57e131f 100644 --- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html +++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html @@ -2,7 +2,6 @@ -{% include './snippets/from-ecep-cms/site-css-links.html' %} {% include './snippets/from-tup-cms/css-elements-monospace.html' %} {% include './snippets/from-tup-cms/css-elements-address.html' %} {% include './snippets/from-tup-cms/css-elements-body.html' %}