From 5f39df6cbd4599de36e6c8532e7404cb478ad7bb Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 15 Nov 2022 21:40:34 -0600 Subject: [PATCH 001/137] feat(core-styles): get updates beyond v0.11.0 --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65239bdcd..9e3cad70d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^0.11.0", + "@tacc/core-styles": "github:TACC/Core-Styles#ea9c380", "minimist": "^1.2.6" }, "engines": { @@ -511,9 +511,9 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.11.0.tgz", - "integrity": "sha512-TmAqeQPzJ39lGOj3AF9QNtt+Lo1Jfne35PSdSl0M+K52qCoFqurSqiV36thB/JJ7W6VcAR4LHP4J1pDwVuj7wg==", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#ea9c38006e1c53e5744fea7512f14afaaaf7e368", "dev": true, + "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -9675,10 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.11.0.tgz", - "integrity": "sha512-TmAqeQPzJ39lGOj3AF9QNtt+Lo1Jfne35PSdSl0M+K52qCoFqurSqiV36thB/JJ7W6VcAR4LHP4J1pDwVuj7wg==", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#ea9c38006e1c53e5744fea7512f14afaaaf7e368", "dev": true, + "from": "@tacc/core-styles@github:TACC/Core-Styles#ea9c380", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 1da9257e6..9a52ba887 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^0.11.0", + "@tacc/core-styles": "github:TACC/Core-Styles#ea9c380", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 10cac659656b4c1dbf309b5d345fa965460ec4b2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 16 Nov 2022 09:54:57 -0600 Subject: [PATCH 002/137] fix(core-styles): import new table objects --- taccsite_cms/static/site_cms/css/src/site.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 78129b517..84d2bf45f 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -36,6 +36,8 @@ @import url("_imports/objects/o-float-content.css"); @import url("_imports/objects/o-offset-content.css"); @import url("_imports/objects/o-section.css"); +@import url("@tacc/core-styles/src/lib/_imports/objects/o-fixed-header-table.css"); +@import url("@tacc/core-styles/src/lib/_imports/objects/o-table-wrap.css"); /* COMPONENTS */ @import url("_imports/components/c-card.css"); From e4bea96078038b4a70bd11079fa3cfba162561ba Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 16 Nov 2022 10:35:17 -0600 Subject: [PATCH 003/137] fix(core-styles): rename file so a demo page loads https://github.com/TACC/Core-Styles/pull/69 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e3cad70d..b68dbefc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#ea9c380", + "@tacc/core-styles": "github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#ea9c38006e1c53e5744fea7512f14afaaaf7e368", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#2964cd07fa40b5971ad107a40fbaaa8c1f90fa27", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#ea9c38006e1c53e5744fea7512f14afaaaf7e368", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#2964cd07fa40b5971ad107a40fbaaa8c1f90fa27", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#ea9c380", + "from": "@tacc/core-styles@github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 9a52ba887..d68c246f2 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#ea9c380", + "@tacc/core-styles": "github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 2cb36112349197302c79344e57218754d6bad2c2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 16 Nov 2022 10:46:07 -0600 Subject: [PATCH 004/137] feat(taccsite_ui): use tup cms link color --- taccsite_ui/fractal.theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_ui/fractal.theme.js b/taccsite_ui/fractal.theme.js index 3af07960b..60f3588bc 100644 --- a/taccsite_ui/fractal.theme.js +++ b/taccsite_ui/fractal.theme.js @@ -6,7 +6,7 @@ const themeConfig = require('@tacc/core-styles/fractal.theme.js'); // Extend base theme const newThemeConfig = Object.assign( themeConfig, { skin: Object.assign( themeConfig.skin, { - links: '#877453', + links: '#003399', // from tup-cms }) }); From 87b8df3573d77cd29af8183cb27105b53c6fea8a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 16 Nov 2022 11:02:45 -0600 Subject: [PATCH 005/137] fix(core-styles): let demo bootstrap, fix caption --- package-lock.json | 4 ++-- taccsite_ui/fractal.config.js | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b68dbefc1..7a92a312a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#2964cd07fa40b5971ad107a40fbaaa8c1f90fa27", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#7dbe24e9b944655216e5fe31bbb67cfc89d71956", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#2964cd07fa40b5971ad107a40fbaaa8c1f90fa27", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#7dbe24e9b944655216e5fe31bbb67cfc89d71956", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", "requires": {} diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index c969ba873..680d5bd73 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -30,10 +30,7 @@ fractal.components.set('default.context', { styles: { shouldSkipBase: true, // true, because site.css includes components external: { - global: [ - 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css', - cmsCSSFile, - ].concat( ( projCSSFile ) ? [ projCSSFile ] : [] ) + global: [ cmsCSSFile ].concat( ( projCSSFile ) ? [ projCSSFile ] : [] ) } } }); From d8fd7bc06b8bf5b02cd05806d8d72aed24e055f3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 17 Nov 2022 09:46:32 -0600 Subject: [PATCH 006/137] feat(core-styles): pin to latest of main now The previously installed branch was merged to main. --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a92a312a..4e9e81d42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", + "@tacc/core-styles": "github:TACC/Core-Styles#d4c966b", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#7dbe24e9b944655216e5fe31bbb67cfc89d71956", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d4c966b3b8b089ca432a2afc26a91e9051997b0c", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#7dbe24e9b944655216e5fe31bbb67cfc89d71956", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d4c966b3b8b089ca432a2afc26a91e9051997b0c", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", + "from": "@tacc/core-styles@github:TACC/Core-Styles#d4c966b", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index d68c246f2..e94c0c606 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#fix/fp-1878-table-object-bugs", + "@tacc/core-styles": "github:TACC/Core-Styles#d4c966b", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 7b40ae67d5bf6adbffc2d42bfa9c3c0ca09e5a9a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:02:04 -0600 Subject: [PATCH 007/137] feat(core-styles): load deps, dist, misc, fonts - fix(fonts): fp-1891 add regular italic, also add black (#71) - feat(objects): warning about still-disabled o-site - feat(components): icon updates from Core-Portal - docs(trumps): comment about lifespan of u-empty - chore(elements): body margin 0 - feat(dist): commit dist for clients relying on it (#70) - chore: import dependencies in each pattern --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e9e81d42..115bd8f66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#d4c966b", + "@tacc/core-styles": "github:TACC/Core-Styles#7faef4f", "minimist": "^1.2.6" }, "engines": { @@ -510,8 +510,8 @@ } }, "node_modules/@tacc/core-styles": { - "version": "0.11.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d4c966b3b8b089ca432a2afc26a91e9051997b0c", + "version": "0.11.0-7-g34c8c4c", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#7faef4fdc05663cedb3a269937b438e201f28738", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d4c966b3b8b089ca432a2afc26a91e9051997b0c", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#7faef4fdc05663cedb3a269937b438e201f28738", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#d4c966b", + "from": "@tacc/core-styles@github:TACC/Core-Styles#7faef4f", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index e94c0c606..69df4a64a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#d4c966b", + "@tacc/core-styles": "github:TACC/Core-Styles#7faef4f", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 79c60d1bc226c63c4164be26bc88b17ff2e89e1b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:14:50 -0600 Subject: [PATCH 008/137] feat(core-styles): install base stylesheets --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 115bd8f66..6f8b0a154 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#7faef4f", + "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#7faef4fdc05663cedb3a269937b438e201f28738", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17e459c69f1878740b9f1273df89570b5407bc5c", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#7faef4fdc05663cedb3a269937b438e201f28738", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17e459c69f1878740b9f1273df89570b5407bc5c", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#7faef4f", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 69df4a64a..09714f21a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#7faef4f", + "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 7eb8d9887bbfacc0ea33b46e30ca4f27b33191ce Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:53:06 -0600 Subject: [PATCH 009/137] fix(core-styles): install fixed base stylesheets --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f8b0a154..cdcd89612 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17e459c69f1878740b9f1273df89570b5407bc5c", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d02c0d08e3cfca691667dbbbd57bebd3d5ac52eb", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17e459c69f1878740b9f1273df89570b5407bc5c", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d02c0d08e3cfca691667dbbbd57bebd3d5ac52eb", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} From ff123583ac80d1f9517a667cb69a4ff4ea0b5d29 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:54:30 -0600 Subject: [PATCH 010/137] chore(npm): copy fonts after css build (specific) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09714f21a..01db15637 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "scripts": { "build": "npm run build:css && npm run build:css-demo", "build:css": "bin/build-css.js --project=$npm_config_project --build-id=$npm_config_build_id", - "postbuild": "cp -r node_modules/@tacc/core-styles/src/lib/fonts/* taccsite_cms/static/site_cms/fonts", + "postbuild:css": "cp -r node_modules/@tacc/core-styles/src/lib/fonts/* taccsite_cms/static/site_cms/fonts", "build:css-demo": "cd taccsite_ui && fractal build --project=$npm_config_project" }, "homepage": "https://github.com/TACC/Core-CMS" From 68d8a2149b497ed8651beb879fbb4928285d0db6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:55:55 -0600 Subject: [PATCH 011/137] fix(core-styles): load icons (which moved) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Core-Styles, icon CSS moved: trumps/icon → components cortal.icon. --- taccsite_cms/static/site_cms/css/src/site.header.css | 2 +- taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/site.header.css b/taccsite_cms/static/site_cms/css/src/site.header.css index 2afbf01e7..a8e1848ce 100644 --- a/taccsite_cms/static/site_cms/css/src/site.header.css +++ b/taccsite_cms/static/site_cms/css/src/site.header.css @@ -19,7 +19,7 @@ /* FP-526: Consider loading Cortal icons with as delayed asset */ /* NOTE: This import is duplicated from `icon.css` because `@font-face` is ineffectual in Shadow DOM (where `site.tacc-search-bar.css` is loaded) */ /* SEE: https://bugs.chromium.org/p/chromium/issues/detail?id=336876 */ -@import url("_imports/trumps/icon.fonts.css"); +@import url("@tacc/core-styles/dist/components/cortal.icon.css"); /* FAQ: Because of third-party code and a rush to style the Frontera header (which meant maintaining existing markup), scope classes were used for - the header diff --git a/taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css b/taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css index 7919cc6db..ed30bd3cb 100644 --- a/taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css +++ b/taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css @@ -8,7 +8,7 @@ /* TRUMPS */ /* Shared with Portal */ -@import url("_imports/trumps/icon.css"); +@import url("@tacc/core-styles/dist/components/cortal.icon.css"); @import url("_imports/trumps/u-hide.css"); @import url("_imports/trumps/tacc-search-bar.css"); From 34b87dff9054aa39ab5371f0e3f216a2fc81bc23 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 15:58:04 -0600 Subject: [PATCH 012/137] feat(css): serve core-styles base CSS as if a CDN J.R. and I agree a real CDN makes sense for Core-Styles, long-term. J.R. doesn't know about this temp solution yet. He'll have better idea. --- taccsite_cms/static/site_cms/css/src/base.cms.css | 1 + taccsite_cms/static/site_cms/css/src/base.css | 1 + taccsite_cms/static/site_cms/css/src/base.header.css | 1 + taccsite_cms/static/site_cms/css/src/base.portal.css | 1 + 4 files changed, 4 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/base.cms.css create mode 100644 taccsite_cms/static/site_cms/css/src/base.css create mode 100644 taccsite_cms/static/site_cms/css/src/base.header.css create mode 100644 taccsite_cms/static/site_cms/css/src/base.portal.css diff --git a/taccsite_cms/static/site_cms/css/src/base.cms.css b/taccsite_cms/static/site_cms/css/src/base.cms.css new file mode 100644 index 000000000..ae10ae3f6 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/base.cms.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/base.cms.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.css b/taccsite_cms/static/site_cms/css/src/base.css new file mode 100644 index 000000000..eafaee776 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/base.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/base.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.header.css b/taccsite_cms/static/site_cms/css/src/base.header.css new file mode 100644 index 000000000..4ee3d309a --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/base.header.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/base.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.portal.css b/taccsite_cms/static/site_cms/css/src/base.portal.css new file mode 100644 index 000000000..96ad80a83 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/base.portal.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/base.portal.css"); From 1daff5def33549b8483a833cfdd9e1d4688d840d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 16:12:42 -0600 Subject: [PATCH 013/137] chore(taccsite_ui): no re-build core-styles dist No need to re-build Core-Styles since we have it's `dist/`. Related PR: https://github.com/TACC/Core-Styles/pull/70 --- bin/build-css.js | 10 ---------- taccsite_ui/fractal.config.js | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/bin/build-css.js b/bin/build-css.js index 4aa7c9930..a5573684c 100755 --- a/bin/build-css.js +++ b/bin/build-css.js @@ -17,13 +17,11 @@ const BUILD_ID = ARGS['build-id'] || ''; (() => { // Get style paths const corePath = _getPath('taccsite_cms', 'site_cms'); - const demoPath = 'node_modules/@tacc/core-styles'; const projPath = _getPath(`taccsite_custom/${PROJECT_NAME}`, PROJECT_NAME ); const hasProject = ( PROJECT_NAME && PROJECT_NAME !== CORE_NAME ); // Get config paths const coreConfPath = `${ROOT}/${corePath}/.postcssrc.yml`; - const demoConfPath = coreConfPath; const projConfPath = `${ROOT}/${projPath}/.postcssrc.yml`; const confPaths = [coreConfPath]; @@ -47,14 +45,6 @@ const BUILD_ID = ARGS['build-id'] || ''; customConfigs: confPaths }} }); - _build('Demo', { - input: `${ROOT}/${demoPath}/src/**/*.css`, - output: `${ROOT}/${demoPath}/build`, - opts: {...defaultOpts, ...{ - customConfigs: [demoConfPath], - baseMirrorDir: `${ROOT}/${demoPath}/src/lib/_imports` - }} - }); if ( hasProject ) { _build( PROJECT_NAME, { input: `${ROOT}/${projPath}/src/**/*.css`, diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 680d5bd73..ca8ec9b97 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -40,7 +40,7 @@ if ( projCSSFile ) { } // Set website paths -fractal.web.set('static.path', __dirname + '/../node_modules/@tacc/core-styles/build'); +fractal.web.set('static.path', __dirname + '/../node_modules/@tacc/core-styles/dist'); fractal.web.set('builder.dest', __dirname + '/dist'); // Customize theme From 7872ca5e9115766f95bfb50f84f3ec6fb9ddfbed Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 23:08:45 -0600 Subject: [PATCH 014/137] =?UTF-8?q?fix(core-styles):=20base.*.css=20?= =?UTF-8?q?=E2=86=92=20core-styles.*.css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- taccsite_cms/static/site_cms/css/src/base.cms.css | 1 - taccsite_cms/static/site_cms/css/src/base.css | 1 - taccsite_cms/static/site_cms/css/src/base.header.css | 1 - taccsite_cms/static/site_cms/css/src/base.portal.css | 1 - taccsite_cms/static/site_cms/css/src/core-styles.base.css | 1 + taccsite_cms/static/site_cms/css/src/core-styles.cms.css | 1 + taccsite_cms/static/site_cms/css/src/core-styles.header.css | 1 + taccsite_cms/static/site_cms/css/src/core-styles.portal.css | 1 + 9 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/css/src/base.cms.css delete mode 100644 taccsite_cms/static/site_cms/css/src/base.css delete mode 100644 taccsite_cms/static/site_cms/css/src/base.header.css delete mode 100644 taccsite_cms/static/site_cms/css/src/base.portal.css create mode 100644 taccsite_cms/static/site_cms/css/src/core-styles.base.css create mode 100644 taccsite_cms/static/site_cms/css/src/core-styles.cms.css create mode 100644 taccsite_cms/static/site_cms/css/src/core-styles.header.css create mode 100644 taccsite_cms/static/site_cms/css/src/core-styles.portal.css diff --git a/package-lock.json b/package-lock.json index cdcd89612..107165ee1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d02c0d08e3cfca691667dbbbd57bebd3d5ac52eb", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8bb41c3ec9b9fd730c062c97ecfeb0371eab25af", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d02c0d08e3cfca691667dbbbd57bebd3d5ac52eb", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8bb41c3ec9b9fd730c062c97ecfeb0371eab25af", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/src/base.cms.css b/taccsite_cms/static/site_cms/css/src/base.cms.css deleted file mode 100644 index ae10ae3f6..000000000 --- a/taccsite_cms/static/site_cms/css/src/base.cms.css +++ /dev/null @@ -1 +0,0 @@ -@import url("@tacc/core-styles/dist/base.cms.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.css b/taccsite_cms/static/site_cms/css/src/base.css deleted file mode 100644 index eafaee776..000000000 --- a/taccsite_cms/static/site_cms/css/src/base.css +++ /dev/null @@ -1 +0,0 @@ -@import url("@tacc/core-styles/dist/base.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.header.css b/taccsite_cms/static/site_cms/css/src/base.header.css deleted file mode 100644 index 4ee3d309a..000000000 --- a/taccsite_cms/static/site_cms/css/src/base.header.css +++ /dev/null @@ -1 +0,0 @@ -@import url("@tacc/core-styles/dist/base.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/base.portal.css b/taccsite_cms/static/site_cms/css/src/base.portal.css deleted file mode 100644 index 96ad80a83..000000000 --- a/taccsite_cms/static/site_cms/css/src/base.portal.css +++ /dev/null @@ -1 +0,0 @@ -@import url("@tacc/core-styles/dist/base.portal.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.base.css b/taccsite_cms/static/site_cms/css/src/core-styles.base.css new file mode 100644 index 000000000..75ffce758 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/core-styles.base.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/core-styles.base.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.cms.css b/taccsite_cms/static/site_cms/css/src/core-styles.cms.css new file mode 100644 index 000000000..bf3cd833e --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/core-styles.cms.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/core-styles.cms.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.header.css b/taccsite_cms/static/site_cms/css/src/core-styles.header.css new file mode 100644 index 000000000..a6cf12ead --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/core-styles.header.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/core-styles.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.portal.css b/taccsite_cms/static/site_cms/css/src/core-styles.portal.css new file mode 100644 index 000000000..e3843963c --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/core-styles.portal.css @@ -0,0 +1 @@ +@import url("@tacc/core-styles/dist/core-styles.portal.css"); From 3d5f11c607647fa1ff33eab126f40beb8d772c00 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 23:11:57 -0600 Subject: [PATCH 015/137] test(css): v1 core-styles: setting, layers - Add core styles version setting. - Load core-styles from pseudo-CDN. - Use new CSS layer tech to load stylesheets. --- taccsite_cms/settings.py | 8 ++++++++ taccsite_cms/templates/assets_site.html | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index c81644baf..dec6167f8 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -253,6 +253,14 @@ def gettext(s): return s TACC_BLOG_SHOW_CATEGORIES = True TACC_BLOG_SHOW_TAGS = True +######################## +# TACC: CORE STYLES +######################## + +# Only use integer numbers (not "v1", not "0.11.0"), +# so templates can load based on simple comparisons +TACC_CORE_STYLES_VERSION = 0 + ######################## # CLIENT BUILD SETTINGS ######################## diff --git a/taccsite_cms/templates/assets_site.html b/taccsite_cms/templates/assets_site.html index 884377e33..d1075d140 100644 --- a/taccsite_cms/templates/assets_site.html +++ b/taccsite_cms/templates/assets_site.html @@ -13,15 +13,33 @@ +{% if settings.TACC_CORE_STYLES_VERSION == 0 %} + {# CAVEAT: Requires `npm run build` step before running the Django project. #} +{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} + + + +{% endif %} + -{# Portal & Docs #} +{# "CEPv2" Portal & Frontera Docs #} {# FAQ: Websites that load CMS header should load these assets in this order #} {% comment %} {# To load externally-hosted font which is in the font stack of CMS styles #} From ee79fad114393bce66003c18a311df42876788bc Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 21 Nov 2022 23:23:59 -0600 Subject: [PATCH 016/137] fix(css): v1 core-styles: export setting --- taccsite_cms/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index dec6167f8..b8b4647c2 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -617,5 +617,6 @@ def get_subdirs_as_module_names(path): 'GOOGLE_ANALYTICS_PROPERTY_ID', 'GOOGLE_ANALYTICS_PRELOAD', 'TACC_BLOG_SHOW_CATEGORIES', - 'TACC_BLOG_SHOW_TAGS' + 'TACC_BLOG_SHOW_TAGS', + 'TACC_CORE_STYLES_VERSION' ] From 3179f3a5743d83599fae98cc110fe708d39cc65b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 01:52:44 -0600 Subject: [PATCH 017/137] chore(settings): explicit pass to templates --- taccsite_cms/templates/base.html | 2 +- taccsite_cms/templates/header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html index 9c9f13fc2..ffde11319 100755 --- a/taccsite_cms/templates/base.html +++ b/taccsite_cms/templates/base.html @@ -36,7 +36,7 @@ {# The core site assets (can NOT be replaced by custom assets) #} - {% include 'assets_site.html' %} + {% include 'assets_site.html' with settings=settings %} {# Placeholder for custom assets #} diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html index feee8b360..0e3736149 100644 --- a/taccsite_cms/templates/header.html +++ b/taccsite_cms/templates/header.html @@ -23,7 +23,7 @@ {% include "nav_cms.html" with className="navbar-nav" %} {# NOTE: As of 2022-10, search is only available with a Portal #} - {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline ml-auto" only %}{% endif %} + {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline ml-auto" settings=settings only %}{% endif %} {% if settings.INCLUDES_PORTAL_NAV %}{% include "nav_portal.html" with className="navbar-nav" settings=settings only %}{% endif %} {% else %} {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #} From 03fb16c7d7cc249f9512e740f3717bf2d6f1b8a6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 01:53:50 -0600 Subject: [PATCH 018/137] fix(settings): TACC_CORE_STYLES_VERSION nav_search --- taccsite_cms/templates/nav_search.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/taccsite_cms/templates/nav_search.html b/taccsite_cms/templates/nav_search.html index c61e2b5ee..66923baed 100644 --- a/taccsite_cms/templates/nav_search.html +++ b/taccsite_cms/templates/nav_search.html @@ -13,12 +13,16 @@ import * as registerCustomElement from '/static/site_cms/js/modules/registerCustomElement.js'; const template = document.getElementById('s-search-bar').firstElementChild; + + {% if settings.TACC_CORE_STYLES_VERSION == 0 %} /* Load necessary Bootstrap outside raw markup so CMS */ /* FAQ: CMS, Portal, User Guide each use a different Bootstrap file */ /* TODO: After CMS redesign, use only one Bootstrap version (Portal's) */ template.content.prepend( document.getElementById('css-bootstrap').cloneNode(true) ); + {% endif %} + registerCustomElement.fromTemplate(template, 'tacc-search-bar'); From be4d68aeab832b42961941ead856ddf261167d05 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 01:55:34 -0600 Subject: [PATCH 019/137] fix(core-styles): base includes cms --- package-lock.json | 4 ++-- taccsite_cms/templates/assets_site.html | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 107165ee1..1bcf6fa5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8bb41c3ec9b9fd730c062c97ecfeb0371eab25af", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0ee442a892354a53833b232e30664c4044e623f7", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8bb41c3ec9b9fd730c062c97ecfeb0371eab25af", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0ee442a892354a53833b232e30664c4044e623f7", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} diff --git a/taccsite_cms/templates/assets_site.html b/taccsite_cms/templates/assets_site.html index d1075d140..18f83d507 100644 --- a/taccsite_cms/templates/assets_site.html +++ b/taccsite_cms/templates/assets_site.html @@ -24,15 +24,16 @@ {% elif settings.TACC_CORE_STYLES_VERSION == 1 %} {% endif %} From 09ead266bb84ff758653b6506f5633c51e4b9ef6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 02:32:04 -0600 Subject: [PATCH 020/137] fix(core-styles): load latest (i thought i had) --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bcf6fa5c..aa801be02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0ee442a892354a53833b232e30664c4044e623f7", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#44dee14db1c5fcfd7ff07b51610390348624860c", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0ee442a892354a53833b232e30664c4044e623f7", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#44dee14db1c5fcfd7ff07b51610390348624860c", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} From 9757a079bc6a77ef93dfd2b5ea7c60bbd2375a63 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 02:44:01 -0600 Subject: [PATCH 021/137] fix(core-styles): s-portal-nav on layers --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa801be02..c243ee3f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#44dee14db1c5fcfd7ff07b51610390348624860c", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17a5c2551c00697abc89027e951394abd0c9e440", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#44dee14db1c5fcfd7ff07b51610390348624860c", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17a5c2551c00697abc89027e951394abd0c9e440", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} From 4f8846599430f8a9432c28ad098652378c7678c6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 02:58:27 -0600 Subject: [PATCH 022/137] fix(core-styles): build s-portal-nav on layers --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c243ee3f3..d4ec196ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17a5c2551c00697abc89027e951394abd0c9e440", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#015bca7b5da20706687fb721a22db2de33f6c208", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17a5c2551c00697abc89027e951394abd0c9e440", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#015bca7b5da20706687fb721a22db2de33f6c208", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} From 86c821369cff02efca0dc13e0767c2ade2bba598 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 22 Nov 2022 11:58:12 -0600 Subject: [PATCH 023/137] feat(css): project.global.css, if/then font load --- .../site_cms/css/src/project.global.css | 35 +++++++++++++++++++ taccsite_cms/templates/assets_font.html | 9 +++++ taccsite_cms/templates/assets_site.html | 1 + .../templates/assets_site_delayed.html | 4 +++ 4 files changed, 49 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/project.global.css diff --git a/taccsite_cms/static/site_cms/css/src/project.global.css b/taccsite_cms/static/site_cms/css/src/project.global.css new file mode 100644 index 000000000..a22c91fd2 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/project.global.css @@ -0,0 +1,35 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +/* Organize via ITCSS */ +/* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */ + +/* FAQ: File paths are functional, but not consistent: + - Local files are prepended with `./imports/`. + - Remote files are prepended with `@tacc/core-styles/src/lib/_imports/`. + - Automatic file locators are prepended with `_imports/`.﹡ + + ﹡ Files is first searched for locally, then remotely. +*/ + +/* SETTINGS */ +@import url("./_imports/settings/font.css"); + +/* GENERICS */ +/* Mostly from Bootstrap */ +/* https://confluence.tacc.utexas.edu/x/b53tDg */ + +/* ELEMENTS */ +/* To override Bootstrap or Core-Styles */ + +/* OBJECTS */ +/* (none) */ + +/* COMPONENTS */ +@import url("./_imports/components/django.cms.css"); +@import url("./_imports/components/django.cms.blog.css"); +@import url("./_imports/components/django.cms.forms.css"); +@import url("./_imports/components/django.cms.post.css"); +@import url("./_imports/components/django.cms.picture.css"); + +/* TRUMPS */ +/* (none) */ diff --git a/taccsite_cms/templates/assets_font.html b/taccsite_cms/templates/assets_font.html index 21bdfd7dd..8e151875e 100644 --- a/taccsite_cms/templates/assets_font.html +++ b/taccsite_cms/templates/assets_font.html @@ -3,10 +3,19 @@ {% load staticfiles %} +{% if settings.TACC_CORE_STYLES_VERSION == 0 %} +{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} + +{# TODO: Determine whether and how to load Core-Styles fonts early #} +{# FAQ: They are currently loaded from Core-Styles (settings/font.css) #} +{# https://github.com/TACC/Core-Styles/blob/7faef4f/src/lib/_imports/settings/font.css#L22 #} + +{% endif %} + {# Example #} diff --git a/taccsite_cms/templates/assets_site.html b/taccsite_cms/templates/assets_site.html index 18f83d507..1569e152a 100644 --- a/taccsite_cms/templates/assets_site.html +++ b/taccsite_cms/templates/assets_site.html @@ -35,6 +35,7 @@ @import url("{% static 'site_cms/css/build/core-styles.cms.css' %}") layer(base); @import url("{% static 'site_cms/css/build/core-styles.header.css' %}") layer(base); + {% endif %} diff --git a/taccsite_cms/templates/assets_site_delayed.html b/taccsite_cms/templates/assets_site_delayed.html index f4dc54351..32deec52b 100644 --- a/taccsite_cms/templates/assets_site_delayed.html +++ b/taccsite_cms/templates/assets_site_delayed.html @@ -29,7 +29,11 @@ }); +{% if settings.TACC_CORE_STYLES_VERSION == 0 %} + {# FAQ: Not loaded in `assets_font.html` because these is NOT font for content which should avoid FOUT, FOIT, FOFT; but decorative, thus superfluous, icons #} + +{% endif %} From f2de1577637532b3baa168a7df940a7774071d38 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 11:44:26 -0600 Subject: [PATCH 024/137] chore(css): adapt to core-styles font path fixes --- package-lock.json | 4 ++-- taccsite_cms/static/site_cms/css/.postcssrc.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4ec196ba..691d567ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#015bca7b5da20706687fb721a22db2de33f6c208", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#849e9c95eeafc69d3bd20dd78b53f95f3e6cc6ff", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#015bca7b5da20706687fb721a22db2de33f6c208", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#849e9c95eeafc69d3bd20dd78b53f95f3e6cc6ff", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/.postcssrc.yml b/taccsite_cms/static/site_cms/css/.postcssrc.yml index 5193f4eb9..95f25c219 100644 --- a/taccsite_cms/static/site_cms/css/.postcssrc.yml +++ b/taccsite_cms/static/site_cms/css/.postcssrc.yml @@ -11,6 +11,7 @@ plugins: importFrom: - 'node_modules/@tacc/core-styles/src/lib/_themes/default.json' postcss-replace: - pattern: ../../fonts/ + # @tacc/core-styles 'dist/' has `../fonts`, while src has `../../fonts` + pattern: (..\/fonts\/|..\/..\/fonts\/) data: replaceAll: /static/site_cms/fonts/ From 72a4aa5b1fc76fa87142fda478729878ab996f9a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 12:09:29 -0600 Subject: [PATCH 025/137] chore(core-styles): dist header style scope fix --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 691d567ba..f48df975a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#849e9c95eeafc69d3bd20dd78b53f95f3e6cc6ff", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#97807e7dd78914881078f79b2dfe2a678ac09738", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#849e9c95eeafc69d3bd20dd78b53f95f3e6cc6ff", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#97807e7dd78914881078f79b2dfe2a678ac09738", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} From 0239cadf667a8fe51019b5039571175a35ce5f22 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 12:53:06 -0600 Subject: [PATCH 026/137] =?UTF-8?q?feat(=E2=80=A6=5Fui):=20patterns=20cms/?= =?UTF-8?q?core=20=E2=86=92=20core-cms/styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taccsite_cms/static/site_cms/css/src/_imports/config.yml | 2 ++ taccsite_ui/patterns/{cms => core-cms} | 0 taccsite_ui/patterns/{core => core-styles} | 0 3 files changed, 2 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/config.yml rename taccsite_ui/patterns/{cms => core-cms} (100%) rename taccsite_ui/patterns/{core => core-styles} (100%) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/config.yml new file mode 100644 index 000000000..873659f5a --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/config.yml @@ -0,0 +1,2 @@ +# This file configures CMS-specific pattern demo directory +label: Core-CMS diff --git a/taccsite_ui/patterns/cms b/taccsite_ui/patterns/core-cms similarity index 100% rename from taccsite_ui/patterns/cms rename to taccsite_ui/patterns/core-cms diff --git a/taccsite_ui/patterns/core b/taccsite_ui/patterns/core-styles similarity index 100% rename from taccsite_ui/patterns/core rename to taccsite_ui/patterns/core-styles From d13ca5090b068fe28175a2ce16aab91f239ec895 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 13:09:57 -0600 Subject: [PATCH 027/137] =?UTF-8?q?feat(=E2=80=A6ui):=20django-cms-forms?= =?UTF-8?q?=20pattern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../djangocms_forms/css/djangocms_forms.css | 2 +- ...ngo.cms.forms.css => django-cms-forms.css} | 10 +- ...s.hacks.css => django-cms-forms.hacks.css} | 0 .../components/django-cms-forms/config.yml | 2 + .../django-cms-forms/django-cms-forms.hbs | 328 ++++++++++++++++++ .../components/django-cms-forms/readme.md | 20 ++ .../site_cms/css/src/project.global.css | 2 +- taccsite_cms/static/site_cms/css/src/site.css | 2 +- .../form_template/default.html.md | 2 +- 9 files changed, 356 insertions(+), 12 deletions(-) rename taccsite_cms/static/site_cms/css/src/_imports/components/{django.cms.forms.css => django-cms-forms.css} (92%) rename taccsite_cms/static/site_cms/css/src/_imports/components/{django.cms.forms.hacks.css => django-cms-forms.hacks.css} (100%) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/readme.md diff --git a/taccsite_cms/static/djangocms_forms/css/djangocms_forms.css b/taccsite_cms/static/djangocms_forms/css/djangocms_forms.css index 3ebd6d84e..2b7999195 100644 --- a/taccsite_cms/static/djangocms_forms/css/djangocms_forms.css +++ b/taccsite_cms/static/djangocms_forms/css/djangocms_forms.css @@ -1,3 +1,3 @@ -/* SEE: ../../site_cms/css/src/_imports/django.cms.forms.css */ +/* SEE: ../../site_cms/css/src/_imports/django-cms-forms.css */ /* FAQ: We uses future syntax that must be processed to work in the present; and the process does not support outputting files to this directory */ diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css similarity index 92% rename from taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css index 782e5f9fc..c158fb3f4 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css @@ -11,7 +11,7 @@ Reference: Styleguide Components.DjangoCMS.Forms */ @import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); -@import url("./django.cms.forms.hacks.css"); +@import url("./django-cms-forms-hacks.css"); @@ -82,6 +82,7 @@ ul.checkboxselectmultiple label { display: flex; gap: 0.5em; align-items: center; + font-weight: revert; /* undo html-elements.cms.css */ } ul.radioselect li:last-child label, ul.checkboxselectmultiple li:last-child label { @@ -97,13 +98,6 @@ ul.checkboxselectmultiple li:last-child label { font-weight: var(--regular); } -/* To not render space from markup between label and asterisk */ -/* FAQ: The `:has(sup, sub)` prevents a 7 from being too high/low */ -.field-wrapper.required:has(label .asterisk) label:has(sub, sup) { - display: flex; - align-items: center; -} - .field-wrapper .asterisk { margin-left: 0.5em; } diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.hacks.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css similarity index 100% rename from taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.forms.hacks.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml new file mode 100644 index 000000000..e37e8784b --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml @@ -0,0 +1,2 @@ +preview: '@preview.bootstrap-cms' +label: Django CMS Forms diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs new file mode 100644 index 000000000..8ee45d66d --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs @@ -0,0 +1,328 @@ +
+ +

Title of Form

+
+ I describe the form, but not very well. +
+ +
+
+ + +
+ + + + + + +
+ We use this to identify your submission. +
+
+ +
+ + + + + + +
+ Choose your favorite fruit. +
+
+ +
+ + + + + + +
+ We use this to know when to wake you up. +
+
+ +
+ + + + +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+ +
+ Which radio stations do you prefer? +
+
+ +
+ + + + + + +
+ Are you checking out today? +
+
+ +
+ + + + +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+ +
+ + + + + + +
+ At which time of day do you get hangry? +
+
+ +
+ + + + + + +
+ Go on, tell me everything. +
+
+ +
+ + + + + + +
+ Please enter today's date. +
+
+ +
+ + + + + + +
+ Upload your favorite image. + + Supported types: + .jpeg,.jpg,.gif,.png + +
+
+ +
+ + + + + + +
+
+ +
+ +
+
+
+ +
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/readme.md b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/readme.md new file mode 100644 index 000000000..795968004 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/readme.md @@ -0,0 +1,20 @@ +To style forms built by [Django CMS forms][djcms-forms]. + +> **⚠️ Important** +> +> **Only** intended for [Django CMS forms][djcms-forms]. To style a form **not** using that plugin, use [TACC form component]({{path './c-form' }}). + +> **ⓘ Notice** +> +> Most of the markup can be seen at [template][djcms-forms-tpl]. Some of the classes and markup come from [Django form field widgets][django-form-widgets]. + +[djcms-forms]: https://pypi.org/project/djangocms-forms-maintained/ "DjangoCMS-Forms (Maintained)" +[djcms-forms-tpl]: https://github.com/avryhof/djangocms-forms/blob/ab38b22/djangocms_forms/templates/djangocms_forms/form_template/default.html "DjangoCMS Forms (Maintained) Template" +[django-form-widgets]: https://docs.djangoproject.com/en/2.2/ref/forms/widgets/ "Django Form Widgets" + + diff --git a/taccsite_cms/static/site_cms/css/src/project.global.css b/taccsite_cms/static/site_cms/css/src/project.global.css index a22c91fd2..603fd6522 100644 --- a/taccsite_cms/static/site_cms/css/src/project.global.css +++ b/taccsite_cms/static/site_cms/css/src/project.global.css @@ -27,7 +27,7 @@ /* COMPONENTS */ @import url("./_imports/components/django.cms.css"); @import url("./_imports/components/django.cms.blog.css"); -@import url("./_imports/components/django.cms.forms.css"); +@import url("./_imports/components/django-cms-forms.css"); @import url("./_imports/components/django.cms.post.css"); @import url("./_imports/components/django.cms.picture.css"); diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 84d2bf45f..fd64842ec 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -54,7 +54,7 @@ @import url("./_imports/components/c-button.css"); @import url("./_imports/components/django.cms.css"); @import url("./_imports/components/django.cms.blog.css"); -@import url("./_imports/components/django.cms.forms.css"); +@import url("./_imports/components/django-cms-forms.css"); @import url("./_imports/components/django.cms.post.css"); @import url("./_imports/components/django.cms.picture.css"); diff --git a/taccsite_cms/templates/djangocms_forms/form_template/default.html.md b/taccsite_cms/templates/djangocms_forms/form_template/default.html.md index a4501efc8..5b1bffe06 100644 --- a/taccsite_cms/templates/djangocms_forms/form_template/default.html.md +++ b/taccsite_cms/templates/djangocms_forms/form_template/default.html.md @@ -11,4 +11,4 @@ But, to avoid that[^1], the two changes have been performed other ways: [original template]: https://github.com/avryhof/djangocms-forms/blob/ab38b22/djangocms_forms/templates/djangocms_forms/form_template/default.html [1]: https://github.com/avryhof/djangocms-forms/pull/12 -[2]: ../../../static/site_cms/css/src/_imports/components/django.cms.forms.css#L103 +[2]: ../../../static/site_cms/css/src/_imports/components/django-cms-forms.css#L167 From 91efa2e104dc0ef7bf3db945e927fba5a4f3bc09 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 13:21:18 -0600 Subject: [PATCH 028/137] =?UTF-8?q?fex(=E2=80=A6ui):=20temp=20core-styles?= =?UTF-8?q?=20django-cms-forms=20works?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f48df975a..17689b483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", + "@tacc/core-styles": "github:TACC/Core-Styles#dev", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#97807e7dd78914881078f79b2dfe2a678ac09738", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#243aceb5d1960d991127522c3287ad40eea2200a", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#97807e7dd78914881078f79b2dfe2a678ac09738", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#243aceb5d1960d991127522c3287ad40eea2200a", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 01db15637..7d7d5868d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", + "@tacc/core-styles": "github:TACC/Core-Styles#dev", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 7159fcf45a88627cdbe51ea44481128fa6038968 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 17:50:38 -0600 Subject: [PATCH 029/137] fix(taccsite): NO DUPLICATE CSS --- package-lock.json | 8 ++--- package.json | 2 +- .../static/site_cms/css/src/0-foundation.css | 3 ++ .../static/site_cms/css/src/1-base.css | 6 ++++ .../static/site_cms/css/src/2-project.css | 12 +++++++ .../{ => _core-styles}/core-styles.base.css | 1 + .../{ => _core-styles}/core-styles.cms.css | 1 + .../{ => _core-styles}/core-styles.header.css | 1 + .../{ => _core-styles}/core-styles.portal.css | 0 ...s.hacks.css => django-cms-forms-hacks.css} | 0 .../css/src/_imports/settings/font.css | 2 -- .../site_cms/css/src/project.global.css | 35 ------------------- taccsite_cms/templates/assets_site.html | 11 ++---- taccsite_ui/fractal.config.js | 22 +++++++----- 14 files changed, 46 insertions(+), 58 deletions(-) create mode 100644 taccsite_cms/static/site_cms/css/src/0-foundation.css create mode 100644 taccsite_cms/static/site_cms/css/src/1-base.css create mode 100644 taccsite_cms/static/site_cms/css/src/2-project.css rename taccsite_cms/static/site_cms/css/src/{ => _core-styles}/core-styles.base.css (54%) rename taccsite_cms/static/site_cms/css/src/{ => _core-styles}/core-styles.cms.css (53%) rename taccsite_cms/static/site_cms/css/src/{ => _core-styles}/core-styles.header.css (54%) rename taccsite_cms/static/site_cms/css/src/{ => _core-styles}/core-styles.portal.css (100%) rename taccsite_cms/static/site_cms/css/src/_imports/components/{django-cms-forms.hacks.css => django-cms-forms-hacks.css} (100%) delete mode 100644 taccsite_cms/static/site_cms/css/src/project.global.css diff --git a/package-lock.json b/package-lock.json index 17689b483..d67c2a0be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev", + "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#243aceb5d1960d991127522c3287ad40eea2200a", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#436995bd819a6c846ad656d93f44a56d5457829c", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#243aceb5d1960d991127522c3287ad40eea2200a", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#436995bd819a6c846ad656d93f44a56d5457829c", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 7d7d5868d..01db15637 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev", + "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/0-foundation.css b/taccsite_cms/static/site_cms/css/src/0-foundation.css new file mode 100644 index 000000000..824dd6b89 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/0-foundation.css @@ -0,0 +1,3 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +@import url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"); diff --git a/taccsite_cms/static/site_cms/css/src/1-base.css b/taccsite_cms/static/site_cms/css/src/1-base.css new file mode 100644 index 000000000..92165c94f --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/1-base.css @@ -0,0 +1,6 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +/* TODO: Host Core-Styles static files on a CDN */ +@import url("./_core-styles/core-styles.base.css"); +@import url("./_core-styles/core-styles.cms.css"); +@import url("./_core-styles/core-styles.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/2-project.css b/taccsite_cms/static/site_cms/css/src/2-project.css new file mode 100644 index 000000000..d2fd6aefd --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/2-project.css @@ -0,0 +1,12 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +/* Organize via ITCSS */ +/* https://confluence.tacc.utexas.edu/x/IAA9Cw */ + +@import url("./_imports/settings/font.css"); + +@import url("./_imports/components/django.cms.css"); +@import url("./_imports/components/django.cms.blog.css"); +@import url("./_imports/components/django-cms-forms.css"); +@import url("./_imports/components/django.cms.post.css"); +@import url("./_imports/components/django.cms.picture.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.base.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.base.css similarity index 54% rename from taccsite_cms/static/site_cms/css/src/core-styles.base.css rename to taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.base.css index 75ffce758..d5755141a 100644 --- a/taccsite_cms/static/site_cms/css/src/core-styles.base.css +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.base.css @@ -1 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ @import url("@tacc/core-styles/dist/core-styles.base.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.cms.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.cms.css similarity index 53% rename from taccsite_cms/static/site_cms/css/src/core-styles.cms.css rename to taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.cms.css index bf3cd833e..bedb02ade 100644 --- a/taccsite_cms/static/site_cms/css/src/core-styles.cms.css +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.cms.css @@ -1 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ @import url("@tacc/core-styles/dist/core-styles.cms.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.header.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.header.css similarity index 54% rename from taccsite_cms/static/site_cms/css/src/core-styles.header.css rename to taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.header.css index a6cf12ead..2ad5d14e7 100644 --- a/taccsite_cms/static/site_cms/css/src/core-styles.header.css +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.header.css @@ -1 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ @import url("@tacc/core-styles/dist/core-styles.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/core-styles.portal.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.portal.css similarity index 100% rename from taccsite_cms/static/site_cms/css/src/core-styles.portal.css rename to taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.portal.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css similarity index 100% rename from taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css index 4f6b1531c..5bc3ce185 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css @@ -1,5 +1,3 @@ -@import url("@tacc/core-styles/src/lib/_imports/settings/font.css"); - :root { --global-font-family--sans: var(--global-font-family--sans--cms); diff --git a/taccsite_cms/static/site_cms/css/src/project.global.css b/taccsite_cms/static/site_cms/css/src/project.global.css deleted file mode 100644 index 603fd6522..000000000 --- a/taccsite_cms/static/site_cms/css/src/project.global.css +++ /dev/null @@ -1,35 +0,0 @@ -/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ - -/* Organize via ITCSS */ -/* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */ - -/* FAQ: File paths are functional, but not consistent: - - Local files are prepended with `./imports/`. - - Remote files are prepended with `@tacc/core-styles/src/lib/_imports/`. - - Automatic file locators are prepended with `_imports/`.﹡ - - ﹡ Files is first searched for locally, then remotely. -*/ - -/* SETTINGS */ -@import url("./_imports/settings/font.css"); - -/* GENERICS */ -/* Mostly from Bootstrap */ -/* https://confluence.tacc.utexas.edu/x/b53tDg */ - -/* ELEMENTS */ -/* To override Bootstrap or Core-Styles */ - -/* OBJECTS */ -/* (none) */ - -/* COMPONENTS */ -@import url("./_imports/components/django.cms.css"); -@import url("./_imports/components/django.cms.blog.css"); -@import url("./_imports/components/django-cms-forms.css"); -@import url("./_imports/components/django.cms.post.css"); -@import url("./_imports/components/django.cms.picture.css"); - -/* TRUMPS */ -/* (none) */ diff --git a/taccsite_cms/templates/assets_site.html b/taccsite_cms/templates/assets_site.html index 1569e152a..1234c7c36 100644 --- a/taccsite_cms/templates/assets_site.html +++ b/taccsite_cms/templates/assets_site.html @@ -27,15 +27,10 @@ {# https://confluence.tacc.utexas.edu/x/b53tDg #} @layer foundation, base, project; - @import url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css") layer(foundation); - - {# CAVEAT: Requires `npm run build` step before running the Django project. #} - {# TODO: Host Core-Styles static files on a CDN #} - @import url("{% static 'site_cms/css/build/core-styles.base.css' %}") layer(base); - @import url("{% static 'site_cms/css/build/core-styles.cms.css' %}") layer(base); - @import url("{% static 'site_cms/css/build/core-styles.header.css' %}") layer(base); + @import url("{% static 'site_cms/css/build/0-foundation.css' %}") layer(foundation); + @import url("{% static 'site_cms/css/build/1-base.css' %}") layer(base); + @import url("{% static 'site_cms/css/build/2-project.css' %}") layer(project); - {% endif %} diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index ca8ec9b97..08268323a 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -16,10 +16,14 @@ let projName = args['project'] || ''; projName = ( projName !== cmsName ) ? projName : ''; // (stylesheet) const escapeDemoDir = '/../..'; // i.e. back out of '/static/ui' -const cmsCSSFile = `${escapeDemoDir}/static/site_cms/css/build/site.css`; -const projCSSFile = ( projName ) - ? `${escapeDemoDir}/static/${projName}/css/build/site.css` - : null; +const cmsCSSFiles = [ + `${escapeDemoDir}/static/site_cms/css/build/0-foundation.css`, + `${escapeDemoDir}/static/site_cms/css/build/1-base.css`, + `${escapeDemoDir}/static/site_cms/css/build/2-project.css` +]; +const projCSSFiles = ( projName ) + ? [`${escapeDemoDir}/static/${projName}/css/build/site.css`] + : []; // Set source paths // (for components) @@ -30,13 +34,15 @@ fractal.components.set('default.context', { styles: { shouldSkipBase: true, // true, because site.css includes components external: { - global: [ cmsCSSFile ].concat( ( projCSSFile ) ? [ projCSSFile ] : [] ) + global: cmsCSSFiles.concat( projCSSFiles ) } } }); -fractal.cli.log(`+ Included CSS for "${cmsName}": '${cmsCSSFile}'`); -if ( projCSSFile ) { - fractal.cli.log(`+ Included CSS for "${projName}": '${projCSSFile}'`); +fractal.cli.log(`+ Included CSS for "${cmsName}"`); +cmsCSSFiles.forEach( file => { fractal.cli.log(file) }); +if ( projCSSFiles.length > 0 ) { + fractal.cli.log(`+ Included CSS for "${projName}"`); + projCSSFiles.forEach( file => { fractal.cli.log(file) }); } // Set website paths From 54427c9a4069bed0d4cc5ef536d2f1d77a93aa70 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 23 Nov 2022 17:55:11 -0600 Subject: [PATCH 030/137] chore(core-styles): latest layers & form patterns --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d67c2a0be..d494e4b1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", + "@tacc/core-styles": "github:TACC/Core-Styles#dev", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#436995bd819a6c846ad656d93f44a56d5457829c", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#c60d40c88b16a10720d2dc4316361b28fc1f95a1", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#436995bd819a6c846ad656d93f44a56d5457829c", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#c60d40c88b16a10720d2dc4316361b28fc1f95a1", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/base-cms-portal-header", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 01db15637..7d7d5868d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/base-cms-portal-header", + "@tacc/core-styles": "github:TACC/Core-Styles#dev", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From dad50e86d335069db0632d9ecc53a16e80edf1d1 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Sun, 27 Nov 2022 18:12:21 -0600 Subject: [PATCH 031/137] chore(core-styles): update font path Caused by: https://github.com/TACC/Core-Styles/pull/74 --- package-lock.json | 4 ++-- taccsite_cms/static/site_cms/css/.postcssrc.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d494e4b1f..0e14be29b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#c60d40c88b16a10720d2dc4316361b28fc1f95a1", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d51af9ec0c5439abcdb24f623cf9814c441ed370", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#c60d40c88b16a10720d2dc4316361b28fc1f95a1", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d51af9ec0c5439abcdb24f623cf9814c441ed370", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/.postcssrc.yml b/taccsite_cms/static/site_cms/css/.postcssrc.yml index 95f25c219..a0d455198 100644 --- a/taccsite_cms/static/site_cms/css/.postcssrc.yml +++ b/taccsite_cms/static/site_cms/css/.postcssrc.yml @@ -11,7 +11,7 @@ plugins: importFrom: - 'node_modules/@tacc/core-styles/src/lib/_themes/default.json' postcss-replace: - # @tacc/core-styles 'dist/' has `../fonts`, while src has `../../fonts` - pattern: (..\/fonts\/|..\/..\/fonts\/) + # @tacc/core-styles 'dist/' uses `./fonts`, while src uses `../../fonts` + pattern: (.\/fonts\/|..\/..\/fonts\/) data: replaceAll: /static/site_cms/fonts/ From 0df415532f774ab9c24f63ff27418868ec8bbcaa Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 09:04:29 -0600 Subject: [PATCH 032/137] feat(core-styles): form patterns --- package-lock.json | 8 +- package.json | 2 +- .../components/django-cms-forms-hacks.css | 3 + .../_imports/components/django-cms-forms.css | 61 +++++--- .../components/django-cms-forms/config.yml | 5 +- .../django-cms-forms/django-cms-forms.hbs | 144 +++++++++++++----- .../site_cms/css/src/_imports/config.yml | 2 +- 7 files changed, 166 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e14be29b..d36ea8753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev", + "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d51af9ec0c5439abcdb24f623cf9814c441ed370", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a5142a0f51dde0be2e687dfde7ad7e715eec5339", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d51af9ec0c5439abcdb24f623cf9814c441ed370", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a5142a0f51dde0be2e687dfde7ad7e715eec5339", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 7d7d5868d..741c7a54f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev", + "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css index 2dc40f254..2c7c3b31a 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css @@ -21,6 +21,9 @@ Styleguide Components.DjangoCMS.Forms.Hacks display: block; margin-top: 0.5em; + /* To override styles inherited from `django-cms-forms.css` */ + font-weight: normal; + /* To mimic c-message */ /* https://github.com/TACC/tup-ui/blob/main/libs/core-styles/src/lib/_imports/components/c-message.css */ padding: 15px 20px; diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css index c158fb3f4..50436cda0 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css @@ -1,16 +1,7 @@ -/* -Django CMS Form Components - -These styles are only for forms created by the Django CMS Form plugin. - -Reference: - -- [Django CMS Form Default Template](https://github.com/avryhof/djangocms-forms/blob/master/djangocms_forms/templates/djangocms_forms/form_template/default.html) -- [TACC's Django CMS Form Default Template](https://github.com/TACC/Core-CMS/blob/master/taccsite_cms/templates/djangocms_forms/form_template/default.html) - -Styleguide Components.DjangoCMS.Forms -*/ @import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-message.css"); +@import url('@tacc/core-styles/src/lib/_imports/tools/x-link.css'); + @import url("./django-cms-forms-hacks.css"); @@ -91,10 +82,10 @@ ul.checkboxselectmultiple li:last-child label { /* Field: Required, Asterisk, Important */ -.field-wrapper.required > label { +.field-wrapper > label { font-weight: var(--bold); } -.field-wrapper.required > label .asterisk { +.field-wrapper > label .asterisk { font-weight: var(--regular); } @@ -131,13 +122,34 @@ ul.checkboxselectmultiple li:last-child label { /* Errors */ -.field-errors { - font-size: var(--global-font-size--small); -} .field-errors ul { margin-top: 1rem; /* mimic ul margin-bottom */ +} +.form-errors ul, +.field-errors ul { margin-bottom: 0; /* overwrite ul margin-bottom */ } +.form-errors { + margin-bottom: 1rem; /* mimic ul margin-bottom */ +} + +.form-errors ul, +.field-errors ul { + list-style: none; + padding-inline: 0; +} + +.form-errors { + @extend .c-message; + @extend .c-message--type-error; + @extend .c-message--scope-section; + @extend .c-message--scope-section.c-message--type-error; +} +.field-errors li { + @extend .c-message; + @extend .c-message--type-error; + @extend .c-message--scope-inline; +} @@ -162,8 +174,21 @@ ul.checkboxselectmultiple { /* Button */ -.form-button, +/* To style obvious buttons that neglect class */ .button-wrapper button[type="submit"] { @extend .c-button; @extend .c-button--primary; } + +.form-button { + @extend .c-button; +} +.form-button[type="submit"] { + @extend .c-button--primary; +} +.form-button:where(:not([type="submit"], [type="reset"])) { + @extend .c-button--secondary; +} +.form-button[type="reset"] { + @extend .c-button--tertiary; +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml index e37e8784b..b7d4c65fb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml @@ -1,2 +1,5 @@ -preview: '@preview.bootstrap-cms' +preview: '@preview.cms' +context: + styles: + shouldSkipBase: false label: Django CMS Forms diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs index 8ee45d66d..2d1a41257 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs @@ -7,10 +7,18 @@
- +
- +
- + @@ -39,17 +51,11 @@ - - - - - - @@ -59,7 +65,11 @@
- + @@ -76,7 +86,11 @@
- + @@ -125,7 +139,11 @@
- +
-
- +
+ -
- + @@ -226,17 +247,11 @@ - - - - - - @@ -246,7 +261,11 @@
- + @@ -264,7 +283,11 @@
- + @@ -281,7 +304,11 @@
- + @@ -302,7 +329,11 @@
- +
- + +
+ + + + diff --git a/taccsite_cms/static/site_cms/css/src/_imports/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/config.yml index 873659f5a..cfae57bcb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/config.yml @@ -1,2 +1,2 @@ # This file configures CMS-specific pattern demo directory -label: Core-CMS +label: Core CMS From d7769ae59da3263872c60d87e08e86eb15a2285f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 16:24:50 -0600 Subject: [PATCH 033/137] feat(demo): refactor asset load - removed asset configuration for django-cms-forms (it "just works" now) - changed asset paths to objects - loaded new @tacc/core-styles: - repo: TACC/Core-Styles - commit: d1f9a89 - branch: dev--task/form-patterns--task/base-cms-portal-header - added clone and delete of core-styles _preview.hbs --- package-lock.json | 8 ++-- package.json | 6 ++- .../components/django-cms-forms/config.yml | 4 -- taccsite_ui/fractal.config.js | 42 ++++++++++++------- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index d36ea8753..4773b22ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns", + "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a5142a0f51dde0be2e687dfde7ad7e715eec5339", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d1f9a8962115c7e8db470972f9290cb2bf91e197", "dev": true, "license": "MIT", "bin": { @@ -9675,9 +9675,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a5142a0f51dde0be2e687dfde7ad7e715eec5339", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d1f9a8962115c7e8db470972f9290cb2bf91e197", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 741c7a54f..29a06ea07 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns", + "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", @@ -19,7 +19,9 @@ "build": "npm run build:css && npm run build:css-demo", "build:css": "bin/build-css.js --project=$npm_config_project --build-id=$npm_config_build_id", "postbuild:css": "cp -r node_modules/@tacc/core-styles/src/lib/fonts/* taccsite_cms/static/site_cms/fonts", - "build:css-demo": "cd taccsite_ui && fractal build --project=$npm_config_project" + "build:css-demo": "cd taccsite_ui && fractal build --project=$npm_config_project", + "prebuild:css-demo": "cp -r node_modules/@tacc/core-styles/src/lib/_imports/_preview.hbs taccsite_cms/static/site_cms/css/src/_imports/", + "postbuild:css-demo": "rm taccsite_cms/static/site_cms/css/src/_imports/_preview.hbs" }, "homepage": "https://github.com/TACC/Core-CMS" } diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml index b7d4c65fb..0dd179cdc 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml @@ -1,5 +1 @@ -preview: '@preview.cms' -context: - styles: - shouldSkipBase: false label: Django CMS Forms diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 08268323a..50a55ae3c 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -17,13 +17,29 @@ let projName = args['project'] || ''; // (stylesheet) const escapeDemoDir = '/../..'; // i.e. back out of '/static/ui' const cmsCSSFiles = [ - `${escapeDemoDir}/static/site_cms/css/build/0-foundation.css`, - `${escapeDemoDir}/static/site_cms/css/build/1-base.css`, - `${escapeDemoDir}/static/site_cms/css/build/2-project.css` + { + isInternal: false, + layer: 'foundation', + path: `${escapeDemoDir}/static/site_cms/css/build/0-foundation.css`, + }, + { + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/1-base.css`, + }, + { + isInternal: false, + layer: 'project', + path: `${escapeDemoDir}/static/site_cms/css/build/2-project.css`, + }, ]; -const projCSSFiles = ( projName ) - ? [`${escapeDemoDir}/static/${projName}/css/build/site.css`] - : []; +const projCSSFiles = ( projName ) ? [ + { + isInternal: false, + layer: 'cosmetic', + path: `${escapeDemoDir}/static/${projName}/css/build/site.css` + }, +] : []; // Set source paths // (for components) @@ -31,18 +47,16 @@ fractal.components.set('exclude', '*.md'); fractal.components.set('path', __dirname + '/patterns'); // (for stylesheets) fractal.components.set('default.context', { - styles: { - shouldSkipBase: true, // true, because site.css includes components - external: { - global: cmsCSSFiles.concat( projCSSFiles ) - } - } + shouldSkipCMS: true, // true, because CMS loads its own styles + shouldSkipBootstrap: true, // true, because CMS loads its own styles + shouldSkipPattern: true, // true, because CMS loads patterns itself + globalStyles: cmsCSSFiles.concat( projCSSFiles ) }); fractal.cli.log(`+ Included CSS for "${cmsName}"`); -cmsCSSFiles.forEach( file => { fractal.cli.log(file) }); +cmsCSSFiles.forEach( file => { fractal.cli.log(file.path) }); if ( projCSSFiles.length > 0 ) { fractal.cli.log(`+ Included CSS for "${projName}"`); - projCSSFiles.forEach( file => { fractal.cli.log(file) }); + projCSSFiles.forEach( file => { fractal.cli.log(file.path) }); } // Set website paths From f797e4ca89f02fefd3f4fd675b9b6105b6e797a9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 16:37:05 -0600 Subject: [PATCH 034/137] fix(core-styles): undo s-portal-nav margin bottom --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4773b22ce..9cafa58db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d1f9a8962115c7e8db470972f9290cb2bf91e197", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#843f54818df53febed5e61ea5dcf5d38a6af511a", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d1f9a8962115c7e8db470972f9290cb2bf91e197", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#843f54818df53febed5e61ea5dcf5d38a6af511a", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} From 2aa71883cb082ee59c9a7e9d4869d44696f1af88 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 17:41:56 -0600 Subject: [PATCH 035/137] fix(fonts): path consistent w/ core-styles --- package-lock.json | 4 ++-- taccsite_cms/static/site_cms/css/.postcssrc.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cafa58db..aa0e3358b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#843f54818df53febed5e61ea5dcf5d38a6af511a", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#2c8c2e8b2eee381db0b05f79b889318665ca3c34", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#843f54818df53febed5e61ea5dcf5d38a6af511a", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#2c8c2e8b2eee381db0b05f79b889318665ca3c34", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/.postcssrc.yml b/taccsite_cms/static/site_cms/css/.postcssrc.yml index a0d455198..fbd2180e4 100644 --- a/taccsite_cms/static/site_cms/css/.postcssrc.yml +++ b/taccsite_cms/static/site_cms/css/.postcssrc.yml @@ -11,7 +11,7 @@ plugins: importFrom: - 'node_modules/@tacc/core-styles/src/lib/_themes/default.json' postcss-replace: - # @tacc/core-styles 'dist/' uses `./fonts`, while src uses `../../fonts` - pattern: (.\/fonts\/|..\/..\/fonts\/) + # @tacc/core-styles: 'src/' uses `fonts/`, 'dist/' uses `../../fonts/` + pattern: (..\/..\/fonts\/|fonts/) data: replaceAll: /static/site_cms/fonts/ From 6efcf55dac85694c85f9ec1454eb44e3a1c9deab Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 19:51:28 -0600 Subject: [PATCH 036/137] =?UTF-8?q?feat(core-sstyles):=20add=20c-form=20to?= =?UTF-8?q?=20=E2=80=A6base.css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa0e3358b..8c4097d4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#2c8c2e8b2eee381db0b05f79b889318665ca3c34", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#48d2c36d301e06ca0acd8a43297b547b0cbdd614", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#2c8c2e8b2eee381db0b05f79b889318665ca3c34", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#48d2c36d301e06ca0acd8a43297b547b0cbdd614", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} From 6ae0653420d37e1f6eb6fb2d0ae6c3fff8f08dbc Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Nov 2022 23:49:47 -0600 Subject: [PATCH 037/137] chore(core-sstyles): install latest current branch --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c4097d4c..ac9f73876 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#48d2c36d301e06ca0acd8a43297b547b0cbdd614", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#71e43a57c2df8e29a7746ce47c32bd863a8f5fe7", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#48d2c36d301e06ca0acd8a43297b547b0cbdd614", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#71e43a57c2df8e29a7746ce47c32bd863a8f5fe7", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} From 219fca65d5af5083e9e9755302e335f934b87467 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 1 Dec 2022 10:26:28 -0600 Subject: [PATCH 038/137] feat: simpler distinction of core-styles v1 change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - replace 0,1,2-….css layer-specific stylesheets with direct imports. - added cms-specific stylesheet (i.e. project styles) - changed core-styles asset load: from new assets_core…'s via base - added missing param comment for nav_search.html - install relevant latest core-styles --- package-lock.json | 4 ++-- .../static/site_cms/css/src/0-foundation.css | 3 --- .../static/site_cms/css/src/1-base.css | 6 ----- .../static/site_cms/css/src/2-project.css | 12 ---------- .../static/site_cms/css/src/README.md | 3 ++- .../static/site_cms/css/src/site.cms.css | 12 ++++++++++ taccsite_cms/templates/assets_core.html | 10 ++++++++ taccsite_cms/templates/assets_core.md | 15 ++++++++++++ taccsite_cms/templates/assets_core_cms.html | 9 +++++++ .../templates/assets_core_delayed.html | 21 ++++++++++++++++ taccsite_cms/templates/assets_font.html | 9 ------- taccsite_cms/templates/assets_site.html | 15 ------------ .../templates/assets_site_delayed.html | 4 ---- taccsite_cms/templates/base.html | 24 +++++++++++++++++-- taccsite_cms/templates/nav_search.html | 2 +- taccsite_ui/fractal.config.js | 16 ++++++++++--- 16 files changed, 107 insertions(+), 58 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/css/src/0-foundation.css delete mode 100644 taccsite_cms/static/site_cms/css/src/1-base.css delete mode 100644 taccsite_cms/static/site_cms/css/src/2-project.css create mode 100644 taccsite_cms/static/site_cms/css/src/site.cms.css create mode 100644 taccsite_cms/templates/assets_core.html create mode 100644 taccsite_cms/templates/assets_core.md create mode 100644 taccsite_cms/templates/assets_core_cms.html create mode 100644 taccsite_cms/templates/assets_core_delayed.html diff --git a/package-lock.json b/package-lock.json index ac9f73876..50331ebae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#71e43a57c2df8e29a7746ce47c32bd863a8f5fe7", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#c04bebe9fd0c7b9222b1cf2b5948205c4f2cde6e", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#71e43a57c2df8e29a7746ce47c32bd863a8f5fe7", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#c04bebe9fd0c7b9222b1cf2b5948205c4f2cde6e", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/src/0-foundation.css b/taccsite_cms/static/site_cms/css/src/0-foundation.css deleted file mode 100644 index 824dd6b89..000000000 --- a/taccsite_cms/static/site_cms/css/src/0-foundation.css +++ /dev/null @@ -1,3 +0,0 @@ -/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ - -@import url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"); diff --git a/taccsite_cms/static/site_cms/css/src/1-base.css b/taccsite_cms/static/site_cms/css/src/1-base.css deleted file mode 100644 index 92165c94f..000000000 --- a/taccsite_cms/static/site_cms/css/src/1-base.css +++ /dev/null @@ -1,6 +0,0 @@ -/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ - -/* TODO: Host Core-Styles static files on a CDN */ -@import url("./_core-styles/core-styles.base.css"); -@import url("./_core-styles/core-styles.cms.css"); -@import url("./_core-styles/core-styles.header.css"); diff --git a/taccsite_cms/static/site_cms/css/src/2-project.css b/taccsite_cms/static/site_cms/css/src/2-project.css deleted file mode 100644 index d2fd6aefd..000000000 --- a/taccsite_cms/static/site_cms/css/src/2-project.css +++ /dev/null @@ -1,12 +0,0 @@ -/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ - -/* Organize via ITCSS */ -/* https://confluence.tacc.utexas.edu/x/IAA9Cw */ - -@import url("./_imports/settings/font.css"); - -@import url("./_imports/components/django.cms.css"); -@import url("./_imports/components/django.cms.blog.css"); -@import url("./_imports/components/django-cms-forms.css"); -@import url("./_imports/components/django.cms.post.css"); -@import url("./_imports/components/django.cms.picture.css"); diff --git a/taccsite_cms/static/site_cms/css/src/README.md b/taccsite_cms/static/site_cms/css/src/README.md index 31d5260e1..3fb78ceb5 100644 --- a/taccsite_cms/static/site_cms/css/src/README.md +++ b/taccsite_cms/static/site_cms/css/src/README.md @@ -6,7 +6,7 @@ AUTHOR STYLESHEETS HERE! - Import stylesheet partials into entry point files here at `./`. - Built stylesheets are compiled to `../build/`. -See project `README.md` at ["Static Files"](/README.md#static-files). +See project `README.md` at ["Static Files"](/README.md#static-files) and [CMS UI Organization]. _This directory exists in `static/` __only__ because it is customary, using Django, for CSS to be authored in this directory._ @@ -53,3 +53,4 @@ _This directory exists in `static/` __only__ because it is customary, using Djan [Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles +[CMS UI Organization]: https://confluence.tacc.utexas.edu/x/54AZCg diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css new file mode 100644 index 000000000..9f2853c76 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -0,0 +1,12 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +/* Organize via ITCSS */ +/* https://confluence.tacc.utexas.edu/x/IAA9Cw */ + +@import url("./_imports/settings/font.css") layer(settings); + +@import url("./_imports/components/django.cms.css") layer(components); +@import url("./_imports/components/django.cms.blog.css") layer(components); +@import url("./_imports/components/django-cms-forms.css") layer(components); +@import url("./_imports/components/django.cms.post.css") layer(components); +@import url("./_imports/components/django.cms.picture.css") layer(components); diff --git a/taccsite_cms/templates/assets_core.html b/taccsite_cms/templates/assets_core.html new file mode 100644 index 000000000..3556758c5 --- /dev/null +++ b/taccsite_cms/templates/assets_core.html @@ -0,0 +1,10 @@ +{# SEE: ./assets_core.md #} +{% load staticfiles %} + + diff --git a/taccsite_cms/templates/assets_core.md b/taccsite_cms/templates/assets_core.md new file mode 100644 index 000000000..24a25cf02 --- /dev/null +++ b/taccsite_cms/templates/assets_core.md @@ -0,0 +1,15 @@ +# TACC CMS - Templates - Core + +This is "the new way" (since Core-Styles v1.0.0) to load assets. + +| CMS Core[^1] | CMS Content[^2] | CMS App[^3] | +| - | - | - | +| `bootstrap.min.css`
`core-styles.base.css`
`core-styles.header.css` | `core-styles.cms.css`
+ CMS-specific CSS | `core-styles.cms.css`
+ App-specific CSS | + +[^1]: I.e. [Core CMS] core templates. +[^2]: I.e. [Core CMS] page content. +[^3]: E.g. [TUP UI], [Core CMS Custom]. + +[Core CMS]: https://github.com/TACC/Core-CMS +[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom +[TUP UI]: https://github.com/TACC/tup-ui diff --git a/taccsite_cms/templates/assets_core_cms.html b/taccsite_cms/templates/assets_core_cms.html new file mode 100644 index 000000000..3ea45e065 --- /dev/null +++ b/taccsite_cms/templates/assets_core_cms.html @@ -0,0 +1,9 @@ +{# SEE: ./assets_core.md #} +{% load staticfiles %} + + diff --git a/taccsite_cms/templates/assets_core_delayed.html b/taccsite_cms/templates/assets_core_delayed.html new file mode 100644 index 000000000..20f7c81ec --- /dev/null +++ b/taccsite_cms/templates/assets_core_delayed.html @@ -0,0 +1,21 @@ +{# SEE: ./assets_core.md #} +{% load staticfiles %} + +{# FAQ: Bootstrap can use jQuery, Popper, then its own script #} +{# SEE: https://getbootstrap.com/docs/4.0/getting-started/introduction/#starter-template #} + + + + diff --git a/taccsite_cms/templates/assets_font.html b/taccsite_cms/templates/assets_font.html index 8e151875e..21bdfd7dd 100644 --- a/taccsite_cms/templates/assets_font.html +++ b/taccsite_cms/templates/assets_font.html @@ -3,19 +3,10 @@ {% load staticfiles %} -{% if settings.TACC_CORE_STYLES_VERSION == 0 %} -{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} - -{# TODO: Determine whether and how to load Core-Styles fonts early #} -{# FAQ: They are currently loaded from Core-Styles (settings/font.css) #} -{# https://github.com/TACC/Core-Styles/blob/7faef4f/src/lib/_imports/settings/font.css#L22 #} - -{% endif %} - {# Example #} diff --git a/taccsite_cms/templates/assets_site.html b/taccsite_cms/templates/assets_site.html index 1234c7c36..e4daabbda 100644 --- a/taccsite_cms/templates/assets_site.html +++ b/taccsite_cms/templates/assets_site.html @@ -1,5 +1,4 @@ {% load staticfiles %} -{# @var settings #} {# Load assets as external files, to cache independently of markup. #} {% comment %} @@ -13,7 +12,6 @@ -{% if settings.TACC_CORE_STYLES_VERSION == 0 %} @@ -21,19 +19,6 @@ -{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} - - - -{% endif %} - {# "CEPv2" Portal & Frontera Docs #} diff --git a/taccsite_cms/templates/assets_site_delayed.html b/taccsite_cms/templates/assets_site_delayed.html index 32deec52b..f4dc54351 100644 --- a/taccsite_cms/templates/assets_site_delayed.html +++ b/taccsite_cms/templates/assets_site_delayed.html @@ -29,11 +29,7 @@ }); -{% if settings.TACC_CORE_STYLES_VERSION == 0 %} - {# FAQ: Not loaded in `assets_font.html` because these is NOT font for content which should avoid FOUT, FOIT, FOFT; but decorative, thus superfluous, icons #} - -{% endif %} diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html index ffde11319..e5a9372e7 100755 --- a/taccsite_cms/templates/base.html +++ b/taccsite_cms/templates/base.html @@ -28,6 +28,8 @@ {% with path="djangocms_page_meta.html" %}{% include path %}{% endwith %} {% endblock meta %} +{% if settings.TACC_CORE_STYLES_VERSION == 0 %} + {# The core site font (can be replaced or accompanied by custom font/s) #} {% block assets_font %} @@ -36,10 +38,19 @@ {# The core site assets (can NOT be replaced by custom assets) #} - {% include 'assets_site.html' with settings=settings %} + {% include 'assets_site.html' %} + +{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} + + + {% include 'assets_core.html' %} + {% block assets_core_project %} + {% include 'assets_core_cms.html' %} + {% endblock assets_core_project %} + +{% endif %} - {# Placeholder for custom assets #} {% block assets_custom %} {% include 'assets_custom.html' %} {% endblock assets_custom %} @@ -82,9 +93,18 @@ {% endblock footer %} +{% if settings.TACC_CORE_STYLES_VERSION == 0 %} + {% include 'assets_site_delayed.html' %} +{% elif settings.TACC_CORE_STYLES_VERSION == 1 %} + + + {% include 'assets_core_delayed.html' %} + +{% endif %} + {% block assets_custom_delayed %} {% include 'assets_custom_delayed.html' %} diff --git a/taccsite_cms/templates/nav_search.html b/taccsite_cms/templates/nav_search.html index 66923baed..b229b6845 100644 --- a/taccsite_cms/templates/nav_search.html +++ b/taccsite_cms/templates/nav_search.html @@ -1,4 +1,4 @@ -{# @var className #} +{# @var settings, className #} {# Encapsulate search bar as custom element, so styles do not bleed out #} {# IDEA: Should CMS use React component or Portal's React use custom element #} diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 50a55ae3c..b4503b87e 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -20,17 +20,27 @@ const cmsCSSFiles = [ { isInternal: false, layer: 'foundation', - path: `${escapeDemoDir}/static/site_cms/css/build/0-foundation.css`, + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, }, { isInternal: false, layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/1-base.css`, + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, + }, + { + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.cms.css`, + }, + { + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.header.css`, }, { isInternal: false, layer: 'project', - path: `${escapeDemoDir}/static/site_cms/css/build/2-project.css`, + path: `${escapeDemoDir}/static/site_cms/css/build/site.cms.css`, }, ]; const projCSSFiles = ( projName ) ? [ From 6b46dceb80c606b08210a43c204cdb204b12c22a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 1 Dec 2022 15:07:51 -0600 Subject: [PATCH 039/137] docs: update URL to Core-Styles --- README.md | 2 +- taccsite_cms/static/site_cms/css/README.md | 2 +- taccsite_cms/static/site_cms/css/src/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index de07e3e24..857e3fe7f 100644 --- a/README.md +++ b/README.md @@ -403,7 +403,7 @@ Only appointed team members may release versions. [Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments [Camino]: https://github.com/TACC/Camino [Core CMS]: https://github.com/TACC/Core-CMS -[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles +[Core Styles]: https://github.com/TACC/Core-Styles [Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources [Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom [Core Portal]: https://github.com/TACC/Core-Portal diff --git a/taccsite_cms/static/site_cms/css/README.md b/taccsite_cms/static/site_cms/css/README.md index 75302de77..242345c1a 100644 --- a/taccsite_cms/static/site_cms/css/README.md +++ b/taccsite_cms/static/site_cms/css/README.md @@ -17,4 +17,4 @@ See [repo `README.md` at "Static Files"](/README.md#static-files). [Core CMS]: https://github.com/TACC/Core-CMS [Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources -[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles +[Core Styles]: https://github.com/TACC/Core-Styles diff --git a/taccsite_cms/static/site_cms/css/src/README.md b/taccsite_cms/static/site_cms/css/src/README.md index 3fb78ceb5..7121afe27 100644 --- a/taccsite_cms/static/site_cms/css/src/README.md +++ b/taccsite_cms/static/site_cms/css/src/README.md @@ -52,5 +52,5 @@ _This directory exists in `static/` __only__ because it is customary, using Djan -[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles +[Core Styles]: https://github.com/TACC/Core-Styles [CMS UI Organization]: https://confluence.tacc.utexas.edu/x/54AZCg From 53f7f7e8488cb60f6fbed7efd4a79cc8f313b22a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 2 Dec 2022 01:44:15 -0600 Subject: [PATCH 040/137] fix(demo): load bootstrap, not base twice --- taccsite_ui/fractal.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index b4503b87e..74479bb63 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -20,7 +20,7 @@ const cmsCSSFiles = [ { isInternal: false, layer: 'foundation', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, + path: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css', }, { isInternal: false, From fc95edf5108b02d8fbddf9c99303af2ee118522e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 2 Dec 2022 01:44:48 -0600 Subject: [PATCH 041/137] chore(core-styles): install latest --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50331ebae..25cfc45e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -510,8 +510,8 @@ } }, "node_modules/@tacc/core-styles": { - "version": "0.11.0-7-g34c8c4c", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#c04bebe9fd0c7b9222b1cf2b5948205c4f2cde6e", + "version": "v0.11.0-30-g66400cb", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#1684413d49d5c1604d623421684b360ff499a162", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#c04bebe9fd0c7b9222b1cf2b5948205c4f2cde6e", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#1684413d49d5c1604d623421684b360ff499a162", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} From b30b7289c29f42f0bb6f72367db181c6c5dc8330 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 2 Dec 2022 01:45:59 -0600 Subject: [PATCH 042/137] chore(core-styles): install even latest-er --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25cfc45e0..eddc1f01f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "v0.11.0-30-g66400cb", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#1684413d49d5c1604d623421684b360ff499a162", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0870dcd473c563bb4db63e579463648d1316cf59", "dev": true, "license": "MIT", "bin": { @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#1684413d49d5c1604d623421684b360ff499a162", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0870dcd473c563bb4db63e579463648d1316cf59", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} From 319d7bf6eebc3e3c5b9b410ca4e983ee80610881 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 2 Dec 2022 03:38:15 -0600 Subject: [PATCH 043/137] chore(core-styles): install most latest-er --- package-lock.json | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index eddc1f01f..b6d6eb80b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "v0.11.0-30-g66400cb", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0870dcd473c563bb4db63e579463648d1316cf59", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#996e6f33de60127d88e6e1a8c7d4713233185d5e", "dev": true, "license": "MIT", "bin": { @@ -533,7 +533,7 @@ "postcss-cli": "^10.0.0", "postcss-extend": "^1.0.5", "postcss-import": "^15.0.0", - "postcss-preset-env": "^7.8.2", + "postcss-preset-env": "^7.8.3", "postcss-replace": "^2.0.0" } }, @@ -2000,9 +2000,9 @@ } }, "node_modules/cssdb": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.2.tgz", - "integrity": "sha512-Vm4b6P/PifADu0a76H0DKRNVWq3Rq9xa/Nx6oEMUBJlwTUuZoZ3dkZxo8Gob3UEL53Cq+Ma1GBgISed6XEBs3w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz", + "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==", "dev": true, "peer": true, "funding": { @@ -5788,9 +5788,9 @@ } }, "node_modules/postcss-custom-properties": { - "version": "12.1.10", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz", - "integrity": "sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==", + "version": "12.1.11", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", + "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", "dev": true, "peer": true, "dependencies": { @@ -6605,13 +6605,13 @@ } }, "node_modules/postcss-preset-env": { - "version": "7.8.2", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz", - "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", + "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", "dev": true, "peer": true, "dependencies": { - "@csstools/postcss-cascade-layers": "^1.1.0", + "@csstools/postcss-cascade-layers": "^1.1.1", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -6625,19 +6625,19 @@ "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", - "autoprefixer": "^10.4.11", - "browserslist": "^4.21.3", + "autoprefixer": "^10.4.13", + "browserslist": "^4.21.4", "css-blank-pseudo": "^3.0.3", "css-has-pseudo": "^3.0.4", "css-prefers-color-scheme": "^6.0.3", - "cssdb": "^7.0.1", + "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", "postcss-custom-media": "^8.0.2", - "postcss-custom-properties": "^12.1.9", + "postcss-custom-properties": "^12.1.10", "postcss-custom-selectors": "^6.0.3", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", @@ -9675,7 +9675,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0870dcd473c563bb4db63e579463648d1316cf59", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#996e6f33de60127d88e6e1a8c7d4713233185d5e", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} @@ -10796,9 +10796,9 @@ "peer": true }, "cssdb": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.2.tgz", - "integrity": "sha512-Vm4b6P/PifADu0a76H0DKRNVWq3Rq9xa/Nx6oEMUBJlwTUuZoZ3dkZxo8Gob3UEL53Cq+Ma1GBgISed6XEBs3w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz", + "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==", "dev": true, "peer": true }, @@ -13644,9 +13644,9 @@ } }, "postcss-custom-properties": { - "version": "12.1.10", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz", - "integrity": "sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==", + "version": "12.1.11", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", + "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", "dev": true, "peer": true, "requires": { @@ -14151,13 +14151,13 @@ } }, "postcss-preset-env": { - "version": "7.8.2", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz", - "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", + "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", "dev": true, "peer": true, "requires": { - "@csstools/postcss-cascade-layers": "^1.1.0", + "@csstools/postcss-cascade-layers": "^1.1.1", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -14171,19 +14171,19 @@ "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", - "autoprefixer": "^10.4.11", - "browserslist": "^4.21.3", + "autoprefixer": "^10.4.13", + "browserslist": "^4.21.4", "css-blank-pseudo": "^3.0.3", "css-has-pseudo": "^3.0.4", "css-prefers-color-scheme": "^6.0.3", - "cssdb": "^7.0.1", + "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", "postcss-custom-media": "^8.0.2", - "postcss-custom-properties": "^12.1.9", + "postcss-custom-properties": "^12.1.10", "postcss-custom-selectors": "^6.0.3", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", From f48256a442a6c4b2a07874d22bbd16e56dbc6b84 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 2 Dec 2022 14:43:43 -0600 Subject: [PATCH 044/137] chore(core-styles): install bleeding edge https://github.com/TACC/Core-Styles/commit/4856f852dbeb7994e3833507951ee2320869924b --- package-lock.json | 356 +++++++++++++++++++++++++++++++--------------- 1 file changed, 239 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6d6eb80b..85a0cc5a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,10 +38,59 @@ "node": ">=0.1.90" } }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-1.0.0.tgz", + "integrity": "sha512-lPphY34yfV15tEXiz/SYaU8hwqAhbAwqiTExv5tOfc7QZxT70VVYrsiPBaX1osdWZFowrDEAhHe4H3JnyzbjhA==", + "dev": true, + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^1.0.0" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-1.0.0.tgz", + "integrity": "sha512-xdFjdQ+zqqkOsmee+kYRieZD9Cqh4hr01YBQ2/8NtTkMMxbtRX18MC50LX6cMrtaLryqmIdZHN9e16/l0QqnQw==", + "dev": true, + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + }, + "node_modules/@csstools/media-query-list-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-1.0.0.tgz", + "integrity": "sha512-HsTj5ejI8NKKZ4IEd6kK2kQZA/JmIVlUV8+XvO/YS9ntrlYPnbmFT3rkqtbxOVfEafblYCNOpeNw1c+fKGkAqw==", + "dev": true, + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^1.0.0", + "@csstools/css-tokenizer": "^1.0.0" + } + }, "node_modules/@csstools/postcss-cascade-layers": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", - "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-2.0.0.tgz", + "integrity": "sha512-99oD++cbAtusDzU1yBy1K2Q6SE9/vLtJ8AEuOvHutZu3lntkzu51okR7UUfFaIRrSQFNu+ri5tW8n42y6pnoaQ==", "dev": true, "peer": true, "dependencies": { @@ -49,14 +98,14 @@ "postcss-selector-parser": "^6.0.10" }, "engines": { - "node": "^12 || ^14 || >=16" + "node": "^14 || ^16 || >=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/@csstools/postcss-color-function": { @@ -239,6 +288,26 @@ "postcss": "^8.3" } }, + "node_modules/@csstools/postcss-scope-pseudo-class": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-1.0.0.tgz", + "integrity": "sha512-Pm2dhbyjJOiYnhkR6rdvvsHN+QvycDENhgWMQV4Ll1CCe3E5iQHN6aw8HYcTBgl4RyHo635XQLZqTXTO3omAng==", + "dev": true, + "peer": true, + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, "node_modules/@csstools/postcss-stepped-value-functions": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", @@ -511,7 +580,7 @@ }, "node_modules/@tacc/core-styles": { "version": "v0.11.0-30-g66400cb", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#996e6f33de60127d88e6e1a8c7d4713233185d5e", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#4856f852dbeb7994e3833507951ee2320869924b", "dev": true, "license": "MIT", "bin": { @@ -531,9 +600,10 @@ "postcss": "^8.4.18", "postcss-banner": "^4.0.1", "postcss-cli": "^10.0.0", + "postcss-env-function": "4.0.6", "postcss-extend": "^1.0.5", "postcss-import": "^15.0.0", - "postcss-preset-env": "^7.8.3", + "postcss-preset-env": "^8.0.0-alpha.1", "postcss-replace": "^2.0.0" } }, @@ -1889,22 +1959,23 @@ } }, "node_modules/css-blank-pseudo": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", - "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-4.1.1.tgz", + "integrity": "sha512-YlRrkfaHdl4N/uqUpDY+33l5iSW4ZLWLwKUamXreM+3GoKjVXsCn8hjYcsoFHEI7jmVruqHp+TG/0tGF4tHvpw==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.9" - }, - "bin": { - "css-blank-pseudo": "dist/cli.cjs" + "postcss-selector-parser": "^6.0.10" }, "engines": { "node": "^12 || ^14 || >=16" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/css-declaration-sorter": { @@ -1921,38 +1992,42 @@ } }, "node_modules/css-has-pseudo": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", - "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-4.0.1.tgz", + "integrity": "sha512-L3s0E0B+DhaFhUVpBAJri+Z7xVijUJQJUIDluB7LcsdNk8MIUS1a2EhrMhmMSGnFULcecQOjIenuvCYgKZBwew==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.9" - }, - "bin": { - "css-has-pseudo": "dist/cli.cjs" + "@csstools/selector-specificity": "^2.0.1", + "postcss-selector-parser": "^6.0.10", + "postcss-value-parser": "^4.2.0" }, "engines": { "node": "^12 || ^14 || >=16" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/css-prefers-color-scheme": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", - "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-7.0.1.tgz", + "integrity": "sha512-vacLYKcuRVtNJyPzP7yL55D9glTNcBEuTR2+EuJaO1tCg81U7+fKHO6rI+EvPAmrYH0uaOM64pEj2Iau+Cf6Cg==", "dev": true, "peer": true, - "bin": { - "css-prefers-color-scheme": "dist/cli.cjs" - }, "engines": { "node": "^12 || ^14 || >=16" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/css-select": { @@ -5768,63 +5843,65 @@ } }, "node_modules/postcss-custom-media": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", - "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-9.0.1.tgz", + "integrity": "sha512-CimS72gZZ0V4WPFg7t7EqFVLxJ0mqwAJSsuk+LNHSo9ApC7d/SuOr65sKrUY/D8locOh+3s4yO7IdqQ9cRSR7Q==", "dev": true, "peer": true, "dependencies": { - "postcss-value-parser": "^4.2.0" + "@csstools/css-parser-algorithms": "^1.0.0", + "@csstools/css-tokenizer": "^1.0.0", + "@csstools/media-query-list-parser": "^1.0.0" }, "engines": { - "node": "^12 || ^14 || >=16" + "node": "^14 || ^16 || >=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.3" + "postcss": "^8.4" } }, "node_modules/postcss-custom-properties": { - "version": "12.1.11", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", - "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.0.0.tgz", + "integrity": "sha512-y4lGIjKPdy1gDyGgwZLpMgqcum04JZZ9UWKxO6WjxSEQ1IzaAFxgbiqcF5M4RWHXFqe5Wa549xXz/4F7DU9TYg==", "dev": true, "peer": true, "dependencies": { "postcss-value-parser": "^4.2.0" }, "engines": { - "node": "^12 || ^14 || >=16" + "node": "^14 || ^16 || >=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/postcss-custom-selectors": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", - "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.0.0.tgz", + "integrity": "sha512-687uwwBf5UvogUDv+w6r2r/QiEMNlMKdreyhh6eYtNIZRmTMbtMuS8w6X1J/8cPSI370haD0j8n7R52Tbpf6sA==", "dev": true, "peer": true, "dependencies": { "postcss-selector-parser": "^6.0.4" }, "engines": { - "node": "^12 || ^14 || >=16" + "node": "^14 || ^16 || >=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.3" + "postcss": "^8.4" } }, "node_modules/postcss-dir-pseudo-class": { @@ -6056,35 +6133,43 @@ } }, "node_modules/postcss-focus-visible": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", - "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-7.1.0.tgz", + "integrity": "sha512-OGxO+eCXVkF94us4uOVLHDPaoJuV8HQhaqmVPo2DtECdjqzWNkmwhFRSRRDT5Sg04JQsAECzgIhpyX0JRTgwlQ==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.9" + "postcss-selector-parser": "^6.0.10" }, "engines": { "node": "^12 || ^14 || >=16" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/postcss-focus-within": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", - "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-6.1.1.tgz", + "integrity": "sha512-3NwCIuP/VQMzKbGS7sxCN8tquUhZSeQg9GGS6krST9dF9R243OvP0+zRBTlO2KgWNotyO4HVB7bwNqWRXicr0Q==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.9" + "postcss-selector-parser": "^6.0.10" }, "engines": { "node": "^12 || ^14 || >=16" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/postcss-font-variant": { @@ -6605,13 +6690,13 @@ } }, "node_modules/postcss-preset-env": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", - "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", + "version": "8.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-8.0.0-alpha.1.tgz", + "integrity": "sha512-AcJVsQg7y5v9lUDipTeZAOinqBpN2O+SI3DG2TisnpvRZGvm07GO23+lJpyNE/TpR2m/jR/LJxAEm8vk5Ej+fw==", "dev": true, "peer": true, "dependencies": { - "@csstools/postcss-cascade-layers": "^1.1.1", + "@csstools/postcss-cascade-layers": "^2.0.0", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -6621,29 +6706,29 @@ "@csstools/postcss-normalize-display-values": "^1.0.1", "@csstools/postcss-oklab-function": "^1.1.1", "@csstools/postcss-progressive-custom-properties": "^1.3.0", + "@csstools/postcss-scope-pseudo-class": "^1.0.0", "@csstools/postcss-stepped-value-functions": "^1.0.1", "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", "autoprefixer": "^10.4.13", "browserslist": "^4.21.4", - "css-blank-pseudo": "^3.0.3", - "css-has-pseudo": "^3.0.4", - "css-prefers-color-scheme": "^6.0.3", + "css-blank-pseudo": "^4.1.1", + "css-has-pseudo": "^4.0.1", + "css-prefers-color-scheme": "^7.0.1", "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", - "postcss-custom-media": "^8.0.2", - "postcss-custom-properties": "^12.1.10", - "postcss-custom-selectors": "^6.0.3", + "postcss-custom-media": "^9.0.0", + "postcss-custom-properties": "^13.0.0", + "postcss-custom-selectors": "^7.0.0", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", - "postcss-env-function": "^4.0.6", - "postcss-focus-visible": "^6.0.4", - "postcss-focus-within": "^5.0.4", + "postcss-focus-visible": "^7.1.0", + "postcss-focus-within": "^6.1.1", "postcss-font-variant": "^5.0.0", "postcss-gap-properties": "^3.0.5", "postcss-image-set-function": "^4.0.7", @@ -6662,14 +6747,14 @@ "postcss-value-parser": "^4.2.0" }, "engines": { - "node": "^12 || ^14 || >=16" + "node": "^14 || ^16 || >=18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/postcss-pseudo-class-any-link": { @@ -9375,10 +9460,33 @@ "dev": true, "optional": true }, + "@csstools/css-parser-algorithms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-1.0.0.tgz", + "integrity": "sha512-lPphY34yfV15tEXiz/SYaU8hwqAhbAwqiTExv5tOfc7QZxT70VVYrsiPBaX1osdWZFowrDEAhHe4H3JnyzbjhA==", + "dev": true, + "peer": true, + "requires": {} + }, + "@csstools/css-tokenizer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-1.0.0.tgz", + "integrity": "sha512-xdFjdQ+zqqkOsmee+kYRieZD9Cqh4hr01YBQ2/8NtTkMMxbtRX18MC50LX6cMrtaLryqmIdZHN9e16/l0QqnQw==", + "dev": true, + "peer": true + }, + "@csstools/media-query-list-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-1.0.0.tgz", + "integrity": "sha512-HsTj5ejI8NKKZ4IEd6kK2kQZA/JmIVlUV8+XvO/YS9ntrlYPnbmFT3rkqtbxOVfEafblYCNOpeNw1c+fKGkAqw==", + "dev": true, + "peer": true, + "requires": {} + }, "@csstools/postcss-cascade-layers": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", - "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-2.0.0.tgz", + "integrity": "sha512-99oD++cbAtusDzU1yBy1K2Q6SE9/vLtJ8AEuOvHutZu3lntkzu51okR7UUfFaIRrSQFNu+ri5tW8n42y6pnoaQ==", "dev": true, "peer": true, "requires": { @@ -9480,6 +9588,16 @@ "postcss-value-parser": "^4.2.0" } }, + "@csstools/postcss-scope-pseudo-class": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-1.0.0.tgz", + "integrity": "sha512-Pm2dhbyjJOiYnhkR6rdvvsHN+QvycDENhgWMQV4Ll1CCe3E5iQHN6aw8HYcTBgl4RyHo635XQLZqTXTO3omAng==", + "dev": true, + "peer": true, + "requires": { + "postcss-selector-parser": "^6.0.10" + } + }, "@csstools/postcss-stepped-value-functions": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", @@ -9675,7 +9793,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#996e6f33de60127d88e6e1a8c7d4713233185d5e", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#4856f852dbeb7994e3833507951ee2320869924b", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} @@ -10728,13 +10846,13 @@ "dev": true }, "css-blank-pseudo": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", - "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-4.1.1.tgz", + "integrity": "sha512-YlRrkfaHdl4N/uqUpDY+33l5iSW4ZLWLwKUamXreM+3GoKjVXsCn8hjYcsoFHEI7jmVruqHp+TG/0tGF4tHvpw==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.9" + "postcss-selector-parser": "^6.0.10" } }, "css-declaration-sorter": { @@ -10746,19 +10864,21 @@ "requires": {} }, "css-has-pseudo": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", - "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-4.0.1.tgz", + "integrity": "sha512-L3s0E0B+DhaFhUVpBAJri+Z7xVijUJQJUIDluB7LcsdNk8MIUS1a2EhrMhmMSGnFULcecQOjIenuvCYgKZBwew==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.9" + "@csstools/selector-specificity": "^2.0.1", + "postcss-selector-parser": "^6.0.10", + "postcss-value-parser": "^4.2.0" } }, "css-prefers-color-scheme": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", - "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-7.0.1.tgz", + "integrity": "sha512-vacLYKcuRVtNJyPzP7yL55D9glTNcBEuTR2+EuJaO1tCg81U7+fKHO6rI+EvPAmrYH0uaOM64pEj2Iau+Cf6Cg==", "dev": true, "peer": true, "requires": {} @@ -13634,19 +13754,21 @@ } }, "postcss-custom-media": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", - "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-9.0.1.tgz", + "integrity": "sha512-CimS72gZZ0V4WPFg7t7EqFVLxJ0mqwAJSsuk+LNHSo9ApC7d/SuOr65sKrUY/D8locOh+3s4yO7IdqQ9cRSR7Q==", "dev": true, "peer": true, "requires": { - "postcss-value-parser": "^4.2.0" + "@csstools/css-parser-algorithms": "^1.0.0", + "@csstools/css-tokenizer": "^1.0.0", + "@csstools/media-query-list-parser": "^1.0.0" } }, "postcss-custom-properties": { - "version": "12.1.11", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", - "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.0.0.tgz", + "integrity": "sha512-y4lGIjKPdy1gDyGgwZLpMgqcum04JZZ9UWKxO6WjxSEQ1IzaAFxgbiqcF5M4RWHXFqe5Wa549xXz/4F7DU9TYg==", "dev": true, "peer": true, "requires": { @@ -13654,9 +13776,9 @@ } }, "postcss-custom-selectors": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", - "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.0.0.tgz", + "integrity": "sha512-687uwwBf5UvogUDv+w6r2r/QiEMNlMKdreyhh6eYtNIZRmTMbtMuS8w6X1J/8cPSI370haD0j8n7R52Tbpf6sA==", "dev": true, "peer": true, "requires": { @@ -13823,23 +13945,23 @@ } }, "postcss-focus-visible": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", - "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-7.1.0.tgz", + "integrity": "sha512-OGxO+eCXVkF94us4uOVLHDPaoJuV8HQhaqmVPo2DtECdjqzWNkmwhFRSRRDT5Sg04JQsAECzgIhpyX0JRTgwlQ==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.9" + "postcss-selector-parser": "^6.0.10" } }, "postcss-focus-within": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", - "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-6.1.1.tgz", + "integrity": "sha512-3NwCIuP/VQMzKbGS7sxCN8tquUhZSeQg9GGS6krST9dF9R243OvP0+zRBTlO2KgWNotyO4HVB7bwNqWRXicr0Q==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.9" + "postcss-selector-parser": "^6.0.10" } }, "postcss-font-variant": { @@ -14151,13 +14273,13 @@ } }, "postcss-preset-env": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", - "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", + "version": "8.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-8.0.0-alpha.1.tgz", + "integrity": "sha512-AcJVsQg7y5v9lUDipTeZAOinqBpN2O+SI3DG2TisnpvRZGvm07GO23+lJpyNE/TpR2m/jR/LJxAEm8vk5Ej+fw==", "dev": true, "peer": true, "requires": { - "@csstools/postcss-cascade-layers": "^1.1.1", + "@csstools/postcss-cascade-layers": "^2.0.0", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -14167,29 +14289,29 @@ "@csstools/postcss-normalize-display-values": "^1.0.1", "@csstools/postcss-oklab-function": "^1.1.1", "@csstools/postcss-progressive-custom-properties": "^1.3.0", + "@csstools/postcss-scope-pseudo-class": "^1.0.0", "@csstools/postcss-stepped-value-functions": "^1.0.1", "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", "autoprefixer": "^10.4.13", "browserslist": "^4.21.4", - "css-blank-pseudo": "^3.0.3", - "css-has-pseudo": "^3.0.4", - "css-prefers-color-scheme": "^6.0.3", + "css-blank-pseudo": "^4.1.1", + "css-has-pseudo": "^4.0.1", + "css-prefers-color-scheme": "^7.0.1", "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", - "postcss-custom-media": "^8.0.2", - "postcss-custom-properties": "^12.1.10", - "postcss-custom-selectors": "^6.0.3", + "postcss-custom-media": "^9.0.0", + "postcss-custom-properties": "^13.0.0", + "postcss-custom-selectors": "^7.0.0", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", - "postcss-env-function": "^4.0.6", - "postcss-focus-visible": "^6.0.4", - "postcss-focus-within": "^5.0.4", + "postcss-focus-visible": "^7.1.0", + "postcss-focus-within": "^6.1.1", "postcss-font-variant": "^5.0.0", "postcss-gap-properties": "^3.0.5", "postcss-image-set-function": "^4.0.7", From 4ee2239a21dd5890601b8d9b6c0d4937193dab1e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 5 Dec 2022 10:42:24 -0600 Subject: [PATCH 045/137] fix(core-styles): no CSS layers in source CSS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will cause broken styles in CMS. The alpha to support it will be rolled back. And the solution causes difficult-to-follow CSS selectors: ``` …:not(#/#):not(#/#)… ``` --- package-lock.json | 355 ++++++------------ .../static/site_cms/css/src/site.cms.css | 12 +- 2 files changed, 123 insertions(+), 244 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85a0cc5a4..7a6fac1e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,59 +38,10 @@ "node": ">=0.1.90" } }, - "node_modules/@csstools/css-parser-algorithms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-1.0.0.tgz", - "integrity": "sha512-lPphY34yfV15tEXiz/SYaU8hwqAhbAwqiTExv5tOfc7QZxT70VVYrsiPBaX1osdWZFowrDEAhHe4H3JnyzbjhA==", - "dev": true, - "peer": true, - "engines": { - "node": "^14 || ^16 || >=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, - "peerDependencies": { - "@csstools/css-tokenizer": "^1.0.0" - } - }, - "node_modules/@csstools/css-tokenizer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-1.0.0.tgz", - "integrity": "sha512-xdFjdQ+zqqkOsmee+kYRieZD9Cqh4hr01YBQ2/8NtTkMMxbtRX18MC50LX6cMrtaLryqmIdZHN9e16/l0QqnQw==", - "dev": true, - "peer": true, - "engines": { - "node": "^14 || ^16 || >=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - }, - "node_modules/@csstools/media-query-list-parser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-1.0.0.tgz", - "integrity": "sha512-HsTj5ejI8NKKZ4IEd6kK2kQZA/JmIVlUV8+XvO/YS9ntrlYPnbmFT3rkqtbxOVfEafblYCNOpeNw1c+fKGkAqw==", - "dev": true, - "peer": true, - "engines": { - "node": "^14 || ^16 || >=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^1.0.0", - "@csstools/css-tokenizer": "^1.0.0" - } - }, "node_modules/@csstools/postcss-cascade-layers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-2.0.0.tgz", - "integrity": "sha512-99oD++cbAtusDzU1yBy1K2Q6SE9/vLtJ8AEuOvHutZu3lntkzu51okR7UUfFaIRrSQFNu+ri5tW8n42y6pnoaQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", + "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", "dev": true, "peer": true, "dependencies": { @@ -98,14 +49,14 @@ "postcss-selector-parser": "^6.0.10" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^12 || ^14 || >=16" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/@csstools/postcss-color-function": { @@ -288,26 +239,6 @@ "postcss": "^8.3" } }, - "node_modules/@csstools/postcss-scope-pseudo-class": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-1.0.0.tgz", - "integrity": "sha512-Pm2dhbyjJOiYnhkR6rdvvsHN+QvycDENhgWMQV4Ll1CCe3E5iQHN6aw8HYcTBgl4RyHo635XQLZqTXTO3omAng==", - "dev": true, - "peer": true, - "dependencies": { - "postcss-selector-parser": "^6.0.10" - }, - "engines": { - "node": "^12 || ^14 || >=16" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, - "peerDependencies": { - "postcss": "^8.2" - } - }, "node_modules/@csstools/postcss-stepped-value-functions": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", @@ -580,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "v0.11.0-30-g66400cb", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#4856f852dbeb7994e3833507951ee2320869924b", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a772d362870f0259792eeb32dcdcdbc7b9dd5c92", "dev": true, "license": "MIT", "bin": { @@ -603,7 +534,7 @@ "postcss-env-function": "4.0.6", "postcss-extend": "^1.0.5", "postcss-import": "^15.0.0", - "postcss-preset-env": "^8.0.0-alpha.1", + "postcss-preset-env": "^7.8.3", "postcss-replace": "^2.0.0" } }, @@ -1959,23 +1890,22 @@ } }, "node_modules/css-blank-pseudo": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-4.1.1.tgz", - "integrity": "sha512-YlRrkfaHdl4N/uqUpDY+33l5iSW4ZLWLwKUamXreM+3GoKjVXsCn8hjYcsoFHEI7jmVruqHp+TG/0tGF4tHvpw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", + "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" + }, + "bin": { + "css-blank-pseudo": "dist/cli.cjs" }, "engines": { "node": "^12 || ^14 || >=16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/css-declaration-sorter": { @@ -1992,42 +1922,38 @@ } }, "node_modules/css-has-pseudo": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-4.0.1.tgz", - "integrity": "sha512-L3s0E0B+DhaFhUVpBAJri+Z7xVijUJQJUIDluB7LcsdNk8MIUS1a2EhrMhmMSGnFULcecQOjIenuvCYgKZBwew==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", + "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", "dev": true, "peer": true, "dependencies": { - "@csstools/selector-specificity": "^2.0.1", - "postcss-selector-parser": "^6.0.10", - "postcss-value-parser": "^4.2.0" + "postcss-selector-parser": "^6.0.9" + }, + "bin": { + "css-has-pseudo": "dist/cli.cjs" }, "engines": { "node": "^12 || ^14 || >=16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/css-prefers-color-scheme": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-7.0.1.tgz", - "integrity": "sha512-vacLYKcuRVtNJyPzP7yL55D9glTNcBEuTR2+EuJaO1tCg81U7+fKHO6rI+EvPAmrYH0uaOM64pEj2Iau+Cf6Cg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", "dev": true, "peer": true, + "bin": { + "css-prefers-color-scheme": "dist/cli.cjs" + }, "engines": { "node": "^12 || ^14 || >=16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/css-select": { @@ -5843,65 +5769,63 @@ } }, "node_modules/postcss-custom-media": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-9.0.1.tgz", - "integrity": "sha512-CimS72gZZ0V4WPFg7t7EqFVLxJ0mqwAJSsuk+LNHSo9ApC7d/SuOr65sKrUY/D8locOh+3s4yO7IdqQ9cRSR7Q==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", + "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", "dev": true, "peer": true, "dependencies": { - "@csstools/css-parser-algorithms": "^1.0.0", - "@csstools/css-tokenizer": "^1.0.0", - "@csstools/media-query-list-parser": "^1.0.0" + "postcss-value-parser": "^4.2.0" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^12 || ^14 || >=16" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.3" } }, "node_modules/postcss-custom-properties": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.0.0.tgz", - "integrity": "sha512-y4lGIjKPdy1gDyGgwZLpMgqcum04JZZ9UWKxO6WjxSEQ1IzaAFxgbiqcF5M4RWHXFqe5Wa549xXz/4F7DU9TYg==", + "version": "12.1.11", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", + "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", "dev": true, "peer": true, "dependencies": { "postcss-value-parser": "^4.2.0" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^12 || ^14 || >=16" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/postcss-custom-selectors": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.0.0.tgz", - "integrity": "sha512-687uwwBf5UvogUDv+w6r2r/QiEMNlMKdreyhh6eYtNIZRmTMbtMuS8w6X1J/8cPSI370haD0j8n7R52Tbpf6sA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", + "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", "dev": true, "peer": true, "dependencies": { "postcss-selector-parser": "^6.0.4" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^12 || ^14 || >=16" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.3" } }, "node_modules/postcss-dir-pseudo-class": { @@ -6133,43 +6057,35 @@ } }, "node_modules/postcss-focus-visible": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-7.1.0.tgz", - "integrity": "sha512-OGxO+eCXVkF94us4uOVLHDPaoJuV8HQhaqmVPo2DtECdjqzWNkmwhFRSRRDT5Sg04JQsAECzgIhpyX0JRTgwlQ==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", + "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" }, "engines": { "node": "^12 || ^14 || >=16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/postcss-focus-within": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-6.1.1.tgz", - "integrity": "sha512-3NwCIuP/VQMzKbGS7sxCN8tquUhZSeQg9GGS6krST9dF9R243OvP0+zRBTlO2KgWNotyO4HVB7bwNqWRXicr0Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", + "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", "dev": true, "peer": true, "dependencies": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" }, "engines": { "node": "^12 || ^14 || >=16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - }, "peerDependencies": { - "postcss": "^8.2" + "postcss": "^8.4" } }, "node_modules/postcss-font-variant": { @@ -6690,13 +6606,13 @@ } }, "node_modules/postcss-preset-env": { - "version": "8.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-8.0.0-alpha.1.tgz", - "integrity": "sha512-AcJVsQg7y5v9lUDipTeZAOinqBpN2O+SI3DG2TisnpvRZGvm07GO23+lJpyNE/TpR2m/jR/LJxAEm8vk5Ej+fw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", + "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", "dev": true, "peer": true, "dependencies": { - "@csstools/postcss-cascade-layers": "^2.0.0", + "@csstools/postcss-cascade-layers": "^1.1.1", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -6706,29 +6622,29 @@ "@csstools/postcss-normalize-display-values": "^1.0.1", "@csstools/postcss-oklab-function": "^1.1.1", "@csstools/postcss-progressive-custom-properties": "^1.3.0", - "@csstools/postcss-scope-pseudo-class": "^1.0.0", "@csstools/postcss-stepped-value-functions": "^1.0.1", "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", "autoprefixer": "^10.4.13", "browserslist": "^4.21.4", - "css-blank-pseudo": "^4.1.1", - "css-has-pseudo": "^4.0.1", - "css-prefers-color-scheme": "^7.0.1", + "css-blank-pseudo": "^3.0.3", + "css-has-pseudo": "^3.0.4", + "css-prefers-color-scheme": "^6.0.3", "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", - "postcss-custom-media": "^9.0.0", - "postcss-custom-properties": "^13.0.0", - "postcss-custom-selectors": "^7.0.0", + "postcss-custom-media": "^8.0.2", + "postcss-custom-properties": "^12.1.10", + "postcss-custom-selectors": "^6.0.3", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", - "postcss-focus-visible": "^7.1.0", - "postcss-focus-within": "^6.1.1", + "postcss-env-function": "^4.0.6", + "postcss-focus-visible": "^6.0.4", + "postcss-focus-within": "^5.0.4", "postcss-font-variant": "^5.0.0", "postcss-gap-properties": "^3.0.5", "postcss-image-set-function": "^4.0.7", @@ -6747,14 +6663,14 @@ "postcss-value-parser": "^4.2.0" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^12 || ^14 || >=16" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4" + "postcss": "^8.2" } }, "node_modules/postcss-pseudo-class-any-link": { @@ -9460,33 +9376,10 @@ "dev": true, "optional": true }, - "@csstools/css-parser-algorithms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-1.0.0.tgz", - "integrity": "sha512-lPphY34yfV15tEXiz/SYaU8hwqAhbAwqiTExv5tOfc7QZxT70VVYrsiPBaX1osdWZFowrDEAhHe4H3JnyzbjhA==", - "dev": true, - "peer": true, - "requires": {} - }, - "@csstools/css-tokenizer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-1.0.0.tgz", - "integrity": "sha512-xdFjdQ+zqqkOsmee+kYRieZD9Cqh4hr01YBQ2/8NtTkMMxbtRX18MC50LX6cMrtaLryqmIdZHN9e16/l0QqnQw==", - "dev": true, - "peer": true - }, - "@csstools/media-query-list-parser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-1.0.0.tgz", - "integrity": "sha512-HsTj5ejI8NKKZ4IEd6kK2kQZA/JmIVlUV8+XvO/YS9ntrlYPnbmFT3rkqtbxOVfEafblYCNOpeNw1c+fKGkAqw==", - "dev": true, - "peer": true, - "requires": {} - }, "@csstools/postcss-cascade-layers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-2.0.0.tgz", - "integrity": "sha512-99oD++cbAtusDzU1yBy1K2Q6SE9/vLtJ8AEuOvHutZu3lntkzu51okR7UUfFaIRrSQFNu+ri5tW8n42y6pnoaQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", + "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", "dev": true, "peer": true, "requires": { @@ -9588,16 +9481,6 @@ "postcss-value-parser": "^4.2.0" } }, - "@csstools/postcss-scope-pseudo-class": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-1.0.0.tgz", - "integrity": "sha512-Pm2dhbyjJOiYnhkR6rdvvsHN+QvycDENhgWMQV4Ll1CCe3E5iQHN6aw8HYcTBgl4RyHo635XQLZqTXTO3omAng==", - "dev": true, - "peer": true, - "requires": { - "postcss-selector-parser": "^6.0.10" - } - }, "@csstools/postcss-stepped-value-functions": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", @@ -9793,7 +9676,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#4856f852dbeb7994e3833507951ee2320869924b", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a772d362870f0259792eeb32dcdcdbc7b9dd5c92", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} @@ -10846,13 +10729,13 @@ "dev": true }, "css-blank-pseudo": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-4.1.1.tgz", - "integrity": "sha512-YlRrkfaHdl4N/uqUpDY+33l5iSW4ZLWLwKUamXreM+3GoKjVXsCn8hjYcsoFHEI7jmVruqHp+TG/0tGF4tHvpw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", + "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" } }, "css-declaration-sorter": { @@ -10864,21 +10747,19 @@ "requires": {} }, "css-has-pseudo": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-4.0.1.tgz", - "integrity": "sha512-L3s0E0B+DhaFhUVpBAJri+Z7xVijUJQJUIDluB7LcsdNk8MIUS1a2EhrMhmMSGnFULcecQOjIenuvCYgKZBwew==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", + "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", "dev": true, "peer": true, "requires": { - "@csstools/selector-specificity": "^2.0.1", - "postcss-selector-parser": "^6.0.10", - "postcss-value-parser": "^4.2.0" + "postcss-selector-parser": "^6.0.9" } }, "css-prefers-color-scheme": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-7.0.1.tgz", - "integrity": "sha512-vacLYKcuRVtNJyPzP7yL55D9glTNcBEuTR2+EuJaO1tCg81U7+fKHO6rI+EvPAmrYH0uaOM64pEj2Iau+Cf6Cg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", "dev": true, "peer": true, "requires": {} @@ -13754,21 +13635,19 @@ } }, "postcss-custom-media": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-9.0.1.tgz", - "integrity": "sha512-CimS72gZZ0V4WPFg7t7EqFVLxJ0mqwAJSsuk+LNHSo9ApC7d/SuOr65sKrUY/D8locOh+3s4yO7IdqQ9cRSR7Q==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", + "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", "dev": true, "peer": true, "requires": { - "@csstools/css-parser-algorithms": "^1.0.0", - "@csstools/css-tokenizer": "^1.0.0", - "@csstools/media-query-list-parser": "^1.0.0" + "postcss-value-parser": "^4.2.0" } }, "postcss-custom-properties": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.0.0.tgz", - "integrity": "sha512-y4lGIjKPdy1gDyGgwZLpMgqcum04JZZ9UWKxO6WjxSEQ1IzaAFxgbiqcF5M4RWHXFqe5Wa549xXz/4F7DU9TYg==", + "version": "12.1.11", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", + "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", "dev": true, "peer": true, "requires": { @@ -13776,9 +13655,9 @@ } }, "postcss-custom-selectors": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.0.0.tgz", - "integrity": "sha512-687uwwBf5UvogUDv+w6r2r/QiEMNlMKdreyhh6eYtNIZRmTMbtMuS8w6X1J/8cPSI370haD0j8n7R52Tbpf6sA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", + "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", "dev": true, "peer": true, "requires": { @@ -13945,23 +13824,23 @@ } }, "postcss-focus-visible": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-7.1.0.tgz", - "integrity": "sha512-OGxO+eCXVkF94us4uOVLHDPaoJuV8HQhaqmVPo2DtECdjqzWNkmwhFRSRRDT5Sg04JQsAECzgIhpyX0JRTgwlQ==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", + "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" } }, "postcss-focus-within": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-6.1.1.tgz", - "integrity": "sha512-3NwCIuP/VQMzKbGS7sxCN8tquUhZSeQg9GGS6krST9dF9R243OvP0+zRBTlO2KgWNotyO4HVB7bwNqWRXicr0Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", + "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", "dev": true, "peer": true, "requires": { - "postcss-selector-parser": "^6.0.10" + "postcss-selector-parser": "^6.0.9" } }, "postcss-font-variant": { @@ -14273,13 +14152,13 @@ } }, "postcss-preset-env": { - "version": "8.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-8.0.0-alpha.1.tgz", - "integrity": "sha512-AcJVsQg7y5v9lUDipTeZAOinqBpN2O+SI3DG2TisnpvRZGvm07GO23+lJpyNE/TpR2m/jR/LJxAEm8vk5Ej+fw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", + "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", "dev": true, "peer": true, "requires": { - "@csstools/postcss-cascade-layers": "^2.0.0", + "@csstools/postcss-cascade-layers": "^1.1.1", "@csstools/postcss-color-function": "^1.1.1", "@csstools/postcss-font-format-keywords": "^1.0.1", "@csstools/postcss-hwb-function": "^1.0.2", @@ -14289,29 +14168,29 @@ "@csstools/postcss-normalize-display-values": "^1.0.1", "@csstools/postcss-oklab-function": "^1.1.1", "@csstools/postcss-progressive-custom-properties": "^1.3.0", - "@csstools/postcss-scope-pseudo-class": "^1.0.0", "@csstools/postcss-stepped-value-functions": "^1.0.1", "@csstools/postcss-text-decoration-shorthand": "^1.0.0", "@csstools/postcss-trigonometric-functions": "^1.0.2", "@csstools/postcss-unset-value": "^1.0.2", "autoprefixer": "^10.4.13", "browserslist": "^4.21.4", - "css-blank-pseudo": "^4.1.1", - "css-has-pseudo": "^4.0.1", - "css-prefers-color-scheme": "^7.0.1", + "css-blank-pseudo": "^3.0.3", + "css-has-pseudo": "^3.0.4", + "css-prefers-color-scheme": "^6.0.3", "cssdb": "^7.1.0", "postcss-attribute-case-insensitive": "^5.0.2", "postcss-clamp": "^4.1.0", "postcss-color-functional-notation": "^4.2.4", "postcss-color-hex-alpha": "^8.0.4", "postcss-color-rebeccapurple": "^7.1.1", - "postcss-custom-media": "^9.0.0", - "postcss-custom-properties": "^13.0.0", - "postcss-custom-selectors": "^7.0.0", + "postcss-custom-media": "^8.0.2", + "postcss-custom-properties": "^12.1.10", + "postcss-custom-selectors": "^6.0.3", "postcss-dir-pseudo-class": "^6.0.5", "postcss-double-position-gradients": "^3.1.2", - "postcss-focus-visible": "^7.1.0", - "postcss-focus-within": "^6.1.1", + "postcss-env-function": "^4.0.6", + "postcss-focus-visible": "^6.0.4", + "postcss-focus-within": "^5.0.4", "postcss-font-variant": "^5.0.0", "postcss-gap-properties": "^3.0.5", "postcss-image-set-function": "^4.0.7", diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css index 9f2853c76..d2fd6aefd 100644 --- a/taccsite_cms/static/site_cms/css/src/site.cms.css +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -3,10 +3,10 @@ /* Organize via ITCSS */ /* https://confluence.tacc.utexas.edu/x/IAA9Cw */ -@import url("./_imports/settings/font.css") layer(settings); +@import url("./_imports/settings/font.css"); -@import url("./_imports/components/django.cms.css") layer(components); -@import url("./_imports/components/django.cms.blog.css") layer(components); -@import url("./_imports/components/django-cms-forms.css") layer(components); -@import url("./_imports/components/django.cms.post.css") layer(components); -@import url("./_imports/components/django.cms.picture.css") layer(components); +@import url("./_imports/components/django.cms.css"); +@import url("./_imports/components/django.cms.blog.css"); +@import url("./_imports/components/django-cms-forms.css"); +@import url("./_imports/components/django.cms.post.css"); +@import url("./_imports/components/django.cms.picture.css"); From 5fd16760089005f2cb95c805e6124b7d03583320 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 5 Dec 2022 18:39:45 -0600 Subject: [PATCH 046/137] chore(core-styles): v1.0.0 --- 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 7a6fac1e7..d1336f810 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", + "@tacc/core-styles": "^1.0.0", "minimist": "^1.2.6" }, "engines": { @@ -510,10 +510,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "v0.11.0-30-g66400cb", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a772d362870f0259792eeb32dcdcdbc7b9dd5c92", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-1.0.0.tgz", + "integrity": "sha512-2lwaH7ARDrTard8x1qVMJbJJwxYGqhsDwfUCT0eLTL8ZbVml4TtkwDUpndtLMnTkLCFBZPPQkiTVFb/433Jh0A==", "dev": true, - "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -9676,9 +9676,10 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a772d362870f0259792eeb32dcdcdbc7b9dd5c92", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-1.0.0.tgz", + "integrity": "sha512-2lwaH7ARDrTard8x1qVMJbJJwxYGqhsDwfUCT0eLTL8ZbVml4TtkwDUpndtLMnTkLCFBZPPQkiTVFb/433Jh0A==", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 29a06ea07..e31496844 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev--task/form-patterns--task/base-cms-portal-header", + "@tacc/core-styles": "^1.0.0", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From a2eed8a6ad56a46726a3fbe25e0666bacbb20746 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 7 Dec 2022 10:27:01 -0600 Subject: [PATCH 047/137] chore(djangocms_blog): link to extended template --- taccsite_cms/templates/djangocms_blog/post_detail.html | 1 + 1 file changed, 1 insertion(+) diff --git a/taccsite_cms/templates/djangocms_blog/post_detail.html b/taccsite_cms/templates/djangocms_blog/post_detail.html index 7366db042..d631e67e3 100644 --- a/taccsite_cms/templates/djangocms_blog/post_detail.html +++ b/taccsite_cms/templates/djangocms_blog/post_detail.html @@ -1,3 +1,4 @@ +{# https://github.com/nephila/djangocms-blog/blob/1.1.1/djangocms_blog/templates/djangocms_blog/post_detail.html #} {% extends "djangocms_blog/post_detail.html" %} {% load cms_tags %} From a2cf1a90fd76cb8537ccd426ab6562f3d536d3cc Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 7 Dec 2022 11:11:41 -0600 Subject: [PATCH 048/137] feat(djangocms_blog): html, category & tag classes --- taccsite_cms/templates/djangocms_blog/base.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html index 8f371e93b..65519313f 100644 --- a/taccsite_cms/templates/djangocms_blog/base.html +++ b/taccsite_cms/templates/djangocms_blog/base.html @@ -18,6 +18,16 @@
{% block content_blog %}{% endblock %}
From e41265137e6490f2e0c4286dafe8d4309c20bae3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 7 Dec 2022 11:52:44 -0600 Subject: [PATCH 049/137] fix(templates): blog_meta category & tag classname https://github.com/nephila/djangocms-blog/issues/710 --- taccsite_cms/templates/djangocms_blog/includes/blog_meta.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html index 042adcfb2..006b03c72 100644 --- a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html +++ b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html @@ -29,7 +29,7 @@ {% if post.categories.exists %} {% for category in post.categories.all %} {% if category.slug %} -
  • {{ category.name }}{% if not forloop.last %}, {% endif %}
    • +
  • {{ category.name }}{% if not forloop.last %}, {% endif %}
    • {% endif %} {% endfor %} {% endif %} @@ -37,7 +37,7 @@
      {% spaceless %} {% if post.tags.exists %} {% for tag in post.tags.all %} -
    • {{ tag.name }}
      • +
    • {{ tag.name }}
      • {% endfor %} {% endif %} {% endspaceless %}
    From 5fbef9de6ff3350f3a0d0f0a8662476a63c35d79 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 7 Dec 2022 11:56:04 -0600 Subject: [PATCH 050/137] feat(css): django-cms-blog, multimedia article Rough emulation of [design] for a multimedia article. Based on Texascale, cuz I only have article designs for it. [design]: https://xd.adobe.com/view/6947ba13-16f1-4ff9-b1f0-0ed3ffcdc20b-3c14/screen/38333693-be4d-489c-a476-999d2032b5b4/specs/ --- .../components/django.cms.blog.app.css | 9 +++ .../components/django.cms.blog.app.page.css | 1 + .../django.cms.blog.app.page.multimedia.css | 56 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.multimedia.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css index 70db82b45..fbd49629d 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css @@ -37,6 +37,15 @@ Styleguide Components.DjangoCMS.Blog.App +/* Generic */ + +.app-blog { + /* To control absolute position of descendants e.g. `.blog-visual` */ + position: relative; +} + + + /* Header */ .blog-list > header { diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index 572bfad5d..75301ff01 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -7,6 +7,7 @@ Reference: Styleguide Components.DjangoCMS.Blog.App.Page */ +@import url("./django.cms.blog.app.page.multimedia.css"); diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.multimedia.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.multimedia.css new file mode 100644 index 000000000..82d707740 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.multimedia.css @@ -0,0 +1,56 @@ +/* +Django CMS Blog App Page (Article/Post) Components + +Reference: + +- [`post_detail.html`](https://github.com/nephila/djangocms-blog/blob/1.1.1/djangocms_blog/templates/djangocms_blog/post_detail.html) + +Styleguide Components.DjangoCMS.Blog.App.Page +*/ + +@custom-selector :--multimedia-page .app-blog-category-multimedia; + +/* To pull media to top of page and size it */ +:--multimedia-page :--article-page { + --media-width: 100%; + --media-height: 680px; + + margin-top: var(--media-height); +} +:--multimedia-page :--article-page .blog-visual { + position: absolute; + top: 0; + left: 0; + width: var(--media-width); + height: var(--media-height); +} +:--multimedia-page :--article-page .blog-visual img, +:--multimedia-page :--article-page .blog-visual iframe { + width: 100%; + height: 100%; +} + +/* To pad title and content without reducing width */ +:--multimedia-page :--article-page header, +:--multimedia-page :--article-page .blog-content { + --pad: 15px; + + margin-inline: calc( -1 * var(--pad) ); /* prevent width reduction */ +} +:--multimedia-page :--article-page header { + padding: var(--pad) var(--pad) 0; +} +:--multimedia-page :--article-page .blog-content { + padding: 0 var(--pad) var(--pad); +} + +/* To style header atop media */ +:--multimedia-page :--article-page header { + position: relative; + z-index: 1; + background-color: var(--global-color-background--app); + margin-top: -200px; +} +:--multimedia-page :--article-page header h2 { + margin-top: 0; +} From 852ec1f1808eddb0c2471033a59571dc61f7ad28 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 8 Dec 2022 10:18:39 -0600 Subject: [PATCH 051/137] fix(demo): build from cms build not styles dist Also, add missing `core-styles.demo.css` 9which was being loaded from styles dist). Also, load core-styles fix that fixes bug that would occur: https://github.com/TACC/Core-Styles/pull/84 --- package-lock.json | 11 +++++------ package.json | 2 +- .../css/src/_core-styles/core-styles.demo.css | 2 ++ taccsite_ui/fractal.config.js | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.demo.css diff --git a/package-lock.json b/package-lock.json index d1336f810..c27acb986 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^1.0.0", + "@tacc/core-styles": "github:TACC/Core-Styles#07a98ab", "minimist": "^1.2.6" }, "engines": { @@ -511,9 +511,9 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-1.0.0.tgz", - "integrity": "sha512-2lwaH7ARDrTard8x1qVMJbJJwxYGqhsDwfUCT0eLTL8ZbVml4TtkwDUpndtLMnTkLCFBZPPQkiTVFb/433Jh0A==", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#07a98ab53b2314b38e5977141880d970131704dd", "dev": true, + "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -9676,10 +9676,9 @@ } }, "@tacc/core-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-1.0.0.tgz", - "integrity": "sha512-2lwaH7ARDrTard8x1qVMJbJJwxYGqhsDwfUCT0eLTL8ZbVml4TtkwDUpndtLMnTkLCFBZPPQkiTVFb/433Jh0A==", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#07a98ab53b2314b38e5977141880d970131704dd", "dev": true, + "from": "@tacc/core-styles@github:TACC/Core-Styles#07a98ab", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index e31496844..92b814b44 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^1.0.0", + "@tacc/core-styles": "github:TACC/Core-Styles#07a98ab", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.demo.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.demo.css new file mode 100644 index 000000000..3434459aa --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.demo.css @@ -0,0 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ +@import url("@tacc/core-styles/dist/core-styles.demo.css"); diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 74479bb63..3f91d0a21 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -70,7 +70,7 @@ if ( projCSSFiles.length > 0 ) { } // Set website paths -fractal.web.set('static.path', __dirname + '/../node_modules/@tacc/core-styles/dist'); +fractal.web.set('static.path', __dirname + '/../taccsite_cms/static/site_cms/css/build'); fractal.web.set('builder.dest', __dirname + '/dist'); // Customize theme From 400868215cd745ce96e83e3dcb0961f65805b4b9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 8 Dec 2022 10:21:10 -0600 Subject: [PATCH 052/137] feat(css): x-drop-cap, s-drop-cap And a partial for long paragraphs. --- .../_partials/text-of-one-long-paragraph.hbs | 1 + .../css/src/_imports/tools/_tools.config.yml | 2 ++ .../css/src/_imports/tools/x-drop-cap.css | 19 +++++++++++++++++++ .../src/_imports/tools/x-drop-cap/config.yml | 2 ++ .../src/_imports/tools/x-drop-cap/example.css | 9 +++++++++ .../src/_imports/tools/x-drop-cap/readme.md | 9 +++++++++ .../_imports/tools/x-drop-cap/x-drop-cap.hbs | 5 +++++ .../src/_imports/trumps/_trumps.config.yml | 3 +++ .../css/src/_imports/trumps/s-drop-cap.css | 6 ++++++ .../src/_imports/trumps/s-drop-cap/readme.md | 1 + .../_imports/trumps/s-drop-cap/s-drop-cap.hbs | 5 +++++ 11 files changed, 62 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/_tools.config.yml create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap.css create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/example.css create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/readme.md create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/trumps/_trumps.config.yml create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/readme.md create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs diff --git a/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs b/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs new file mode 100644 index 000000000..ba6d420f2 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs @@ -0,0 +1 @@ +{{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/_tools.config.yml b/taccsite_cms/static/site_cms/css/src/_imports/tools/_tools.config.yml new file mode 100644 index 000000000..d68c00d88 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/_tools.config.yml @@ -0,0 +1,2 @@ +context: + subdir: "tools" diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap.css new file mode 100644 index 000000000..340bc4201 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap.css @@ -0,0 +1,19 @@ +.x-drop-cap { + /* Drop the letter */ + float: left; + /* Estimate horizontal spacing to match magazine design */ + /* WARN: Firefox calculates `margin-…` differently here, so use `padding-…` */ + padding-right: 0.125em; /* approx: `1em` of normal text */ + + font-size: 6em; /* approx: 3 lines, of normal text, tall */ + + /* (Firefox v73) Nudge letter up until it meets top of normal text */ + /* CAVEAT: Also has effect in Safari and Chrome/Edge, but not enough */ + padding-top: 0.0625em; + /* (Safari v13, Chrome/Edge v80) Nudge letter up more until it meets top of normal text */ + /* MAGIC: Firefox does not need this */ + /* SEE: https://bugzilla.mozilla.org/show_bug.cgi?id=1233271 */ + /* MAGIC: Has no effect on Firefox */ + /* SEE: https://bugzilla.mozilla.org/show_bug.cgi?id=290125 */ + line-height: 0.65; +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml new file mode 100644 index 000000000..85920abf8 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml @@ -0,0 +1,2 @@ +context: + shouldSkipPattern: false diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/example.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/example.css new file mode 100644 index 000000000..a576870d6 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/example.css @@ -0,0 +1,9 @@ +/* This CSS is EXAMPLE code for a client. It is NOT part of the pattern. */ +/* (only works on TACC clients using PostCSS) */ +/* +@import url('../x-drop-cap.css'); + +.element-whose-first-paragraph-needs-drop-cap > p:first-of-type::first-letter { + @extend .x-drop-cap; +} +*/ diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/readme.md b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/readme.md new file mode 100644 index 000000000..7a653b1ca --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/readme.md @@ -0,0 +1,9 @@ +Create drop-cap on any element. + +> **ⓘ Notice** +> +> To easily apply this, see [s-drop-cap]({{path './trumps/s-drop-cap' }}). + +> **☞ Remember** +> +> This class is designed to extended by your own CSS. For expected usage example, see example.css "File" from "Assets" tab. diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs new file mode 100644 index 000000000..0b08a4833 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs @@ -0,0 +1,5 @@ +
    +

    Lorem Ipsum

    +

    The first letter of this paragraph should have been converted to a drop-cap. The first letters of the following paragraphs should not have been. {{> @text-of-one-long-paragraph }}

    +

    {{> @text-of-one-long-paragraph }}

    +
    diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/_trumps.config.yml b/taccsite_cms/static/site_cms/css/src/_imports/trumps/_trumps.config.yml new file mode 100644 index 000000000..d763eee5a --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/_trumps.config.yml @@ -0,0 +1,3 @@ +label: Trumps (Utilities & Scopes) +context: + subdir: "trumps" diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css new file mode 100644 index 000000000..6b932ba88 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css @@ -0,0 +1,6 @@ +/* This CSS is EXAMPLE code for a client. It is NOT part of the pattern. */ +@import url('../tools/x-drop-cap.css'); + +.s-drop-cap > p:first-of-type::first-letter { + @extend .x-drop-cap; +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/readme.md b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/readme.md new file mode 100644 index 000000000..f2708bcbb --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/readme.md @@ -0,0 +1 @@ +Create drop-cap from first letter of first direct-child paragraph. diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs new file mode 100644 index 000000000..66605a8ee --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs @@ -0,0 +1,5 @@ +
    +

    Lorem Ipsum

    +

    {{> @text-of-one-long-paragraph }}

    +

    {{> @text-of-one-long-paragraph }}

    +
    From c938c6044271e3c11bdb3ac5f15ad59f8c667f30 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 13 Dec 2022 11:07:25 -0600 Subject: [PATCH 053/137] chore(core-styles): misc updates - fix(icon): hide text inside icon (TACC/Core-Styles#86) - fix(package): move npm-watch to devDeps (TACC/Core-Styles@8b2ee16) - feat(cortal.icons): collapse alias (TACC/Core-Styles#85) --- package-lock.json | 330 +--------------------------------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 327 deletions(-) diff --git a/package-lock.json b/package-lock.json index c27acb986..9e8b7ff37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#07a98ab", + "@tacc/core-styles": "github:TACC/Core-Styles", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#07a98ab53b2314b38e5977141880d970131704dd", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9cf8a6048bc02f9140a9d2b96a7215deca84d53e", "dev": true, "license": "MIT", "bin": { @@ -527,7 +527,6 @@ "js-yaml": "^4.1.0", "merge-lite": "^1.0.2", "node-cmd": "^5.0.0", - "npm-watch": "^0.11.0", "postcss": "^8.4.18", "postcss-banner": "^4.0.1", "postcss-cli": "^10.0.0", @@ -3833,13 +3832,6 @@ "node": ">= 4" } }, - "node_modules/ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true, - "peer": true - }, "node_modules/immutable": { "version": "3.8.2", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", @@ -4897,85 +4889,6 @@ "dev": true, "peer": true }, - "node_modules/nodemon": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", - "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", - "dev": true, - "peer": true, - "dependencies": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "bin": { - "nodemon": "bin/nodemon.js" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nodemon" - } - }, - "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "peer": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/nodemon/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/nodemon/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "peer": true - }, - "node_modules/nodemon/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "peer": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/nodemon/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "peer": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -5035,20 +4948,6 @@ "node": ">=8" } }, - "node_modules/npm-watch": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.11.0.tgz", - "integrity": "sha512-wAOd0moNX2kSA2FNvt8+7ORwYaJpQ1ZoWjUYdb1bBCxq4nkWuU0IiJa9VpVxrj5Ks+FGXQd62OC/Bjk0aSr+dg==", - "dev": true, - "peer": true, - "dependencies": { - "nodemon": "^2.0.7", - "through2": "^4.0.2" - }, - "bin": { - "npm-watch": "cli.js" - } - }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -6910,13 +6809,6 @@ "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", "dev": true }, - "node_modules/pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true, - "peer": true - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -7706,29 +7598,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "node_modules/simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", - "dev": true, - "peer": true, - "dependencies": { - "semver": "~7.0.0" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "peer": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -8507,16 +8376,6 @@ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true }, - "node_modules/through2": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", - "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", - "dev": true, - "peer": true, - "dependencies": { - "readable-stream": "3" - } - }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -8623,35 +8482,6 @@ "node": ">=0.6" } }, - "node_modules/touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "peer": true, - "dependencies": { - "nopt": "~1.0.10" - }, - "bin": { - "nodetouch": "bin/nodetouch.js" - } - }, - "node_modules/touch/node_modules/nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, - "peer": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "*" - } - }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -8746,13 +8576,6 @@ "node": ">=0.10.0" } }, - "node_modules/undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true, - "peer": true - }, "node_modules/union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -9676,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#07a98ab53b2314b38e5977141880d970131704dd", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9cf8a6048bc02f9140a9d2b96a7215deca84d53e", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#07a98ab", + "from": "@tacc/core-styles@github:TACC/Core-Styles", "requires": {} }, "@trysound/sax": { @@ -12203,13 +12026,6 @@ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true, - "peer": true - }, "immutable": { "version": "3.8.2", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", @@ -13021,68 +12837,6 @@ "dev": true, "peer": true }, - "nodemon": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", - "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", - "dev": true, - "peer": true, - "requires": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "peer": true, - "requires": { - "ms": "^2.1.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "peer": true - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "peer": true - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "peer": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "peer": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -13121,17 +12875,6 @@ "path-key": "^3.0.0" } }, - "npm-watch": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.11.0.tgz", - "integrity": "sha512-wAOd0moNX2kSA2FNvt8+7ORwYaJpQ1ZoWjUYdb1bBCxq4nkWuU0IiJa9VpVxrj5Ks+FGXQd62OC/Bjk0aSr+dg==", - "dev": true, - "peer": true, - "requires": { - "nodemon": "^2.0.7", - "through2": "^4.0.2" - } - }, "nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -14369,13 +14112,6 @@ "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", "dev": true }, - "pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true, - "peer": true - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -14986,25 +14722,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", - "dev": true, - "peer": true, - "requires": { - "semver": "~7.0.0" - }, - "dependencies": { - "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "peer": true - } - } - }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -15614,16 +15331,6 @@ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true }, - "through2": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", - "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", - "dev": true, - "peer": true, - "requires": { - "readable-stream": "3" - } - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -15707,28 +15414,6 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, - "touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "peer": true, - "requires": { - "nopt": "~1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, - "peer": true, - "requires": { - "abbrev": "1" - } - } - } - }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -15785,13 +15470,6 @@ "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true }, - "undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true, - "peer": true - }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", diff --git a/package.json b/package.json index 92b814b44..0acc9ce2a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#07a98ab", + "@tacc/core-styles": "github:TACC/Core-Styles", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 407fb21ce821785cac2ef83e3058f721a3d9bf67 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 13 Dec 2022 12:17:34 -0600 Subject: [PATCH 054/137] fix(core-styles): hide vert icon text overflow https://github.com/TACC/Core-Styles/pull/88 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e8b7ff37..3d0771ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles", + "@tacc/core-styles": "github:TACC/Core-Styles#382ab54", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9cf8a6048bc02f9140a9d2b96a7215deca84d53e", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#382ab54045db5112fa7270388e494f4d7e19d136", "dev": true, "license": "MIT", "bin": { @@ -9499,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9cf8a6048bc02f9140a9d2b96a7215deca84d53e", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#382ab54045db5112fa7270388e494f4d7e19d136", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles", + "from": "@tacc/core-styles@github:TACC/Core-Styles#382ab54", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 0acc9ce2a..989c311fc 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles", + "@tacc/core-styles": "github:TACC/Core-Styles#382ab54", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 2f9324cb1530d1deca4ee7761765951f932e0437 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 13 Dec 2022 16:45:59 -0600 Subject: [PATCH 055/137] fix(css): cms c-button for site and site.cms - newest cms button styles - load cms button in new cms stylesheet - load core button in old cms stylesheet - avoid duplicate load of stylesheets --- .../site_cms/css/src/_imports/components/c-button.css | 9 ++++++--- taccsite_cms/static/site_cms/css/src/site.cms.css | 1 + taccsite_cms/static/site_cms/css/src/site.css | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css b/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css index e2c563c20..3139b962b 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css @@ -1,6 +1,9 @@ -@import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); -@import url("../settings/font.css"); +.c-button--primary, +.c-button--secondary, +.c-button--tertiary, +.c-button--is-active { + padding: 10px 20px; -.c-button:not(.c-button--as-link) { font-size: var(--global-font-size--small); + text-transform: uppercase; } diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css index d2fd6aefd..d92a44e00 100644 --- a/taccsite_cms/static/site_cms/css/src/site.cms.css +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -5,6 +5,7 @@ @import url("./_imports/settings/font.css"); +@import url("./_imports/components/c-button.css"); @import url("./_imports/components/django.cms.css"); @import url("./_imports/components/django.cms.blog.css"); @import url("./_imports/components/django-cms-forms.css"); diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index fd64842ec..c8fd97a13 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -40,6 +40,7 @@ @import url("@tacc/core-styles/src/lib/_imports/objects/o-table-wrap.css"); /* COMPONENTS */ +@import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); @import url("_imports/components/c-card.css"); @import url("_imports/components/c-callout.css"); @import url("_imports/components/c-data-list.css"); From 08237cef2ad9d72332f42929a8ce5558b128f552 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 14 Dec 2022 12:22:35 -0600 Subject: [PATCH 056/137] feat(core-styles): v1 font-sizes vs. v0 font-sizes - `core-styles.cms.css` will load core-styles font sizes - core-styles@v0-only cuz `assets_core_cms.html` conditional load - `site.css` will load core-styles font sizes - core-styles@v0-only cuz `assets_site.html` conditional load --- package-lock.json | 8 ++++---- package.json | 2 +- .../css/src/_migrations/v1_v0-core-styles.css | 3 +++ .../_migrations/v1_v0-core-styles/settings/font.css | 13 +++++++++++++ taccsite_cms/static/site_cms/css/src/site.css | 1 + 5 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles.css create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles/settings/font.css diff --git a/package-lock.json b/package-lock.json index 3d0771ea7..1bc774fe3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#382ab54", + "@tacc/core-styles": "github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#382ab54045db5112fa7270388e494f4d7e19d136", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17a9393cf598331e1d96926838898cf43160ed23", "dev": true, "license": "MIT", "bin": { @@ -9499,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#382ab54045db5112fa7270388e494f4d7e19d136", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17a9393cf598331e1d96926838898cf43160ed23", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#382ab54", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 989c311fc..07814643f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#382ab54", + "@tacc/core-styles": "github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles.css new file mode 100644 index 000000000..b473c5434 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles.css @@ -0,0 +1,3 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +@import url("./v1_v0-core-styles/settings/font.css"); diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles/settings/font.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles/settings/font.css new file mode 100644 index 000000000..acb0f3416 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v0-core-styles/settings/font.css @@ -0,0 +1,13 @@ +/* +Core CMS font sizes before Core-Styles v1.1.0 +HOW: Migrated original font-sizes to here +SRC: https://github.com/TACC/Core-Styles/blob/v1.0.0/src/lib/_imports/settings/font.css#L35-L41 +SEE: https://confluence.tacc.utexas.edu/x/nh4FDg +*/ +:root { + --global-font-size--x-small: 1.1rem; + --global-font-size--small: 1.4rem; + --global-font-size--medium: 1.6rem; + --global-font-size--large: 2.0rem; + --global-font-size--x-large: 2.6rem; +} diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index c8fd97a13..ed64b4200 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -18,6 +18,7 @@ /* Unique to CMS */ @import url("./_imports/settings/color.css"); @import url("./_imports/settings/font.css"); +@import url("./_migrations/v1_v0-core-styles.css"); /* GENERICS */ /* Bootstrap performs much of this */ From d8080a940fd5164f62faa2ba42220c880137d764 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 14 Dec 2022 12:52:23 -0600 Subject: [PATCH 057/137] fix(core-styles)!: reduce body font size to "12px" It was "16px", then moved up to "18px" with font size value changes, but design wants it at "12px". --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bc774fe3..f33c869c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#17a9393cf598331e1d96926838898cf43160ed23", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0a97e33e43ba6adf2d184fad2f49dee701d8ca49", "dev": true, "license": "MIT", "bin": { @@ -9499,7 +9499,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#17a9393cf598331e1d96926838898cf43160ed23", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0a97e33e43ba6adf2d184fad2f49dee701d8ca49", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", "requires": {} From 35e4a743175496dcc157e4d496518a56c8f9153a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 15 Dec 2022 17:31:39 -0600 Subject: [PATCH 058/137] feat(core-styles): polished font settings Adapt CMS to use: - https://github.com/TACC/Core-Styles/pull/92 - https://github.com/TACC/Core-Styles/pull/93 --- package-lock.json | 8 ++++---- package.json | 2 +- .../src/_imports/_partials/text-of-one-long-paragraph.hbs | 1 - .../static/site_cms/css/src/_imports/settings/font.css | 2 -- .../css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs | 4 ++-- .../css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs diff --git a/package-lock.json b/package-lock.json index f33c869c6..5f168bbb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", + "@tacc/core-styles": "github:TACC/Core-Styles#b694174", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0a97e33e43ba6adf2d184fad2f49dee701d8ca49", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#b6941741a9a02af0a3742b1fec04f02d3557f3cc", "dev": true, "license": "MIT", "bin": { @@ -9499,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0a97e33e43ba6adf2d184fad2f49dee701d8ca49", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#b6941741a9a02af0a3742b1fec04f02d3557f3cc", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", + "from": "@tacc/core-styles@github:TACC/Core-Styles#b694174", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 07814643f..bec2b4b09 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/new-font-sizes-for-cms-and-portal", + "@tacc/core-styles": "github:TACC/Core-Styles#b694174", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs b/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs deleted file mode 100644 index ba6d420f2..000000000 --- a/taccsite_cms/static/site_cms/css/src/_imports/_partials/text-of-one-long-paragraph.hbs +++ /dev/null @@ -1 +0,0 @@ -{{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} {{> @text-of-one-paragraph }} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css index 5bc3ce185..6d61b0dc4 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/settings/font.css @@ -1,6 +1,4 @@ :root { - --global-font-family--sans: var(--global-font-family--sans--cms); - /* FAQ: Used by TACC/Core-Styles `s-header` */ /* FAQ: Overwritten by TACC/Core-CMS-Resource:/texascale-org `props.font` */ --global-font-family: var(--global-font-family--sans); diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs index 0b08a4833..c5e63feb4 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/x-drop-cap.hbs @@ -1,5 +1,5 @@

    Lorem Ipsum

    -

    The first letter of this paragraph should have been converted to a drop-cap. The first letters of the following paragraphs should not have been. {{> @text-of-one-long-paragraph }}

    -

    {{> @text-of-one-long-paragraph }}

    +

    The first letter of this paragraph should have been converted to a drop-cap. The first letters of the following paragraphs should not have been. {{> @text-of-one-paragraph-long }}

    +

    {{> @text-of-one-paragraph-long }}

    diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs index 66605a8ee..15ad4a97a 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap/s-drop-cap.hbs @@ -1,5 +1,5 @@

    Lorem Ipsum

    -

    {{> @text-of-one-long-paragraph }}

    -

    {{> @text-of-one-long-paragraph }}

    +

    {{> @text-of-one-paragraph-long }}

    +

    {{> @text-of-one-paragraph-long }}

    From 1d768cca1c422b697d9ad6a5cc1103d95119c7e2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 15 Dec 2022 20:48:50 -0600 Subject: [PATCH 059/137] feat(core-styles)!: delete v0 CMS heading styles To start fresh with global Snippet styles, then move em to Core-Styles. --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5f168bbb5..1466e72f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#b694174", + "@tacc/core-styles": "github:TACC/Core-Styles#108aafe", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#b6941741a9a02af0a3742b1fec04f02d3557f3cc", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#108aafe6f164cc45032214ae7704c08f63c12ac0", "dev": true, "license": "MIT", "bin": { @@ -9499,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#b6941741a9a02af0a3742b1fec04f02d3557f3cc", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#108aafe6f164cc45032214ae7704c08f63c12ac0", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#b694174", + "from": "@tacc/core-styles@github:TACC/Core-Styles#108aafe", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index bec2b4b09..f24e68405 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#b694174", + "@tacc/core-styles": "github:TACC/Core-Styles#108aafe", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From f6da10a633abe80faf65ca492873ada8072f3405 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 15 Dec 2022 21:23:07 -0600 Subject: [PATCH 060/137] fix(taccsite_ui): load core-styles.demo Load core-styles.demo.css before base, just like TACC/Core-Styles. --- taccsite_ui/fractal.config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 3f91d0a21..e9667e300 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -22,6 +22,11 @@ const cmsCSSFiles = [ layer: 'foundation', path: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css', }, + { + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.demo.css` + }, { isInternal: false, layer: 'base', From 4d2987dc88765280c842f25423432dc5f9fcb453 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 16 Dec 2022 16:26:12 -0600 Subject: [PATCH 061/137] fix(demo): do not force cms styles on all of demo Let cms styles be applied per pattern, like core-styles does. - So, core-styles and core-cms demo do not differ. - Thus, portal and cms can reliably reference demo. A bonus is that core-styles cms and portal stylesheets are pressured be accurate. --- taccsite_ui/fractal.config.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index e9667e300..0b328ed60 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -17,11 +17,6 @@ let projName = args['project'] || ''; // (stylesheet) const escapeDemoDir = '/../..'; // i.e. back out of '/static/ui' const cmsCSSFiles = [ - { - isInternal: false, - layer: 'foundation', - path: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css', - }, { isInternal: false, layer: 'base', @@ -32,21 +27,6 @@ const cmsCSSFiles = [ layer: 'base', path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, }, - { - isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.cms.css`, - }, - { - isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.header.css`, - }, - { - isInternal: false, - layer: 'project', - path: `${escapeDemoDir}/static/site_cms/css/build/site.cms.css`, - }, ]; const projCSSFiles = ( projName ) ? [ { @@ -62,9 +42,7 @@ fractal.components.set('exclude', '*.md'); fractal.components.set('path', __dirname + '/patterns'); // (for stylesheets) fractal.components.set('default.context', { - shouldSkipCMS: true, // true, because CMS loads its own styles - shouldSkipBootstrap: true, // true, because CMS loads its own styles - shouldSkipPattern: true, // true, because CMS loads patterns itself + shouldSkipPattern: true, // true, because …base.css loads most components globalStyles: cmsCSSFiles.concat( projCSSFiles ) }); fractal.cli.log(`+ Included CSS for "${cmsName}"`); From 65ac7d280f5d90630c6e20877762cdea1e7ef2b6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 16 Dec 2022 20:04:26 -0600 Subject: [PATCH 062/137] feat(demo): load global vs. custom cms css files Use new feature from Core-Styles. --- package-lock.json | 8 ++++---- package.json | 2 +- .../components/django-cms-forms/config.yml | 3 +++ .../django-cms-forms/django-cms-forms.hbs | 3 +++ .../site_cms/css/src/_imports/config.yml | 2 ++ taccsite_ui/fractal.config.js | 20 ++++++++++++++----- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1466e72f4..ce35305f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#108aafe", + "@tacc/core-styles": "github:TACC/Core-Styles#task/custom-cms-and-portal-styles", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#108aafe6f164cc45032214ae7704c08f63c12ac0", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#43ff2eb57db6510f97befc06dddbce6264b94b72", "dev": true, "license": "MIT", "bin": { @@ -9499,9 +9499,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#108aafe6f164cc45032214ae7704c08f63c12ac0", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#43ff2eb57db6510f97befc06dddbce6264b94b72", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#108aafe", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/custom-cms-and-portal-styles", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index f24e68405..6cc2ea8f1 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#108aafe", + "@tacc/core-styles": "github:TACC/Core-Styles#task/custom-cms-and-portal-styles", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml index 0dd179cdc..75f29a120 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/config.yml @@ -1 +1,4 @@ label: Django CMS Forms +context: + shouldLoadCMS: true + shouldLoadBootstrap: true diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs index 2d1a41257..00ff7dee8 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs @@ -1,3 +1,6 @@ +

    + This component is maintained simuiltaneously with C Form and should look identical. Eventually, the two should have a single source of truth. To learn more, read (Confluence) APCD - Form Markup & Styles. +

    Title of Form

    diff --git a/taccsite_cms/static/site_cms/css/src/_imports/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/config.yml index cfae57bcb..6a03334ee 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/config.yml @@ -1,2 +1,4 @@ # This file configures CMS-specific pattern demo directory label: Core CMS +context: + shouldLoadCMS: true diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 0b328ed60..919be0dbd 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -20,19 +20,19 @@ const cmsCSSFiles = [ { isInternal: false, layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.demo.css` + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.cms.css`, }, { isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, + layer: 'project', + path: `${escapeDemoDir}/static/site_cms/css/build/site.cms.css` }, ]; const projCSSFiles = ( projName ) ? [ { isInternal: false, layer: 'cosmetic', - path: `${escapeDemoDir}/static/${projName}/css/build/site.css` + path: `${escapeDemoDir}/static/${projName}/css/build/site.cms.css` }, ] : []; @@ -43,7 +43,17 @@ fractal.components.set('path', __dirname + '/patterns'); // (for stylesheets) fractal.components.set('default.context', { shouldSkipPattern: true, // true, because …base.css loads most components - globalStyles: cmsCSSFiles.concat( projCSSFiles ) + globalStyles: [{ + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.demo.css` + }, + { + isInternal: false, + layer: 'base', + path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, + }], + cmsStyles: cmsCSSFiles.concat( projCSSFiles ) }); fractal.cli.log(`+ Included CSS for "${cmsName}"`); cmsCSSFiles.forEach( file => { fractal.cli.log(file.path) }); From c7d17619be867f20194eb9dcbe210362841dd3e4 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 16 Dec 2022 20:19:51 -0600 Subject: [PATCH 063/137] fix(demo): global message hyperlink states --- package-lock.json | 4 ++-- .../_imports/components/django-cms-forms/django-cms-forms.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce35305f1..6ba12c5ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#43ff2eb57db6510f97befc06dddbce6264b94b72", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9d6d6c639d17a8bcb52976bb2d7657d35589d412", "dev": true, "license": "MIT", "bin": { @@ -9499,7 +9499,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#43ff2eb57db6510f97befc06dddbce6264b94b72", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9d6d6c639d17a8bcb52976bb2d7657d35589d412", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/custom-cms-and-portal-styles", "requires": {} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs index 00ff7dee8..fe739c42c 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms/django-cms-forms.hbs @@ -1,4 +1,4 @@ -

    +

    This component is maintained simuiltaneously with C Form and should look identical. Eventually, the two should have a single source of truth. To learn more, read (Confluence) APCD - Form Markup & Styles.

    From e342d51d03dfb4e06f79d6a544a1202d461f079f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Dec 2022 13:59:18 -0600 Subject: [PATCH 064/137] fix(core-styles)!: cms font sizes was missing 14px Breaking Change: CMS Font sizes and names moved. Check its commit. --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ba12c5ef..be6cee88e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9d6d6c639d17a8bcb52976bb2d7657d35589d412", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#bcda55bc6a4d30e93bce8f8fa9003b42538ae00a", "dev": true, "license": "MIT", "bin": { @@ -9499,7 +9499,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9d6d6c639d17a8bcb52976bb2d7657d35589d412", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#bcda55bc6a4d30e93bce8f8fa9003b42538ae00a", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/custom-cms-and-portal-styles", "requires": {} From 76dc2f5d847245edf74af6e7052bb0aba144eb9a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Dec 2022 14:52:14 -0600 Subject: [PATCH 065/137] fix(demo): get missing portal styles, load all from core By building default context atop core-styles, we define less paths. --- taccsite_ui/fractal.config.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 919be0dbd..5880654d6 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -7,6 +7,7 @@ const minimist = require('minimist'); // Get base config const fractal = require('@tacc/core-styles/fractal.config.js'); const themeConfig = require('./fractal.theme.js'); +const defaultContext = fractal.components.get('default.context'); // Get project // (name) @@ -17,11 +18,7 @@ let projName = args['project'] || ''; // (stylesheet) const escapeDemoDir = '/../..'; // i.e. back out of '/static/ui' const cmsCSSFiles = [ - { - isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.cms.css`, - }, + ...defaultContext.cmsStyles, { isInternal: false, layer: 'project', @@ -42,17 +39,8 @@ fractal.components.set('exclude', '*.md'); fractal.components.set('path', __dirname + '/patterns'); // (for stylesheets) fractal.components.set('default.context', { + ...fractal.components.get('default.context'), shouldSkipPattern: true, // true, because …base.css loads most components - globalStyles: [{ - isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.demo.css` - }, - { - isInternal: false, - layer: 'base', - path: `${escapeDemoDir}/static/site_cms/css/build/core-styles.base.css`, - }], cmsStyles: cmsCSSFiles.concat( projCSSFiles ) }); fractal.cli.log(`+ Included CSS for "${cmsName}"`); From 2f90753f9f3f790d1f568f29d2951c08ecca8413 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 Jan 2023 13:55:31 -0600 Subject: [PATCH 066/137] feat(core-styles): new c-card and o-section --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0c734cc9..548c638e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/custom-cms-and-portal-styles", + "@tacc/core-styles": "github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#bcda55bc6a4d30e93bce8f8fa9003b42538ae00a", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#09da36de1d9636456afaba581601aeb69078e3cd", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#bcda55bc6a4d30e93bce8f8fa9003b42538ae00a", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#09da36de1d9636456afaba581601aeb69078e3cd", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/custom-cms-and-portal-styles", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index a067a7aa0..ff69f7e36 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/custom-cms-and-portal-styles", + "@tacc/core-styles": "github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 99bfd234f2a4ebd4b90df90df041b519dd49d2e8 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 6 Jan 2023 00:28:12 -0600 Subject: [PATCH 067/137] feat(core-styles): support .o-section as .section --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 548c638e8..ece96759d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#09da36de1d9636456afaba581601aeb69078e3cd", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#b15658b62e69a6cb431e295bf5ac68e8563f7b03", "dev": true, "license": "MIT", "bin": { @@ -9458,7 +9458,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#09da36de1d9636456afaba581601aeb69078e3cd", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#b15658b62e69a6cb431e295bf5ac68e8563f7b03", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "requires": {} From a93bcbedaee8051b101a27dbea5d885a9e565583 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 6 Jan 2023 00:45:35 -0600 Subject: [PATCH 068/137] feat(settings): card & section Style choices --- taccsite_cms/settings.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 4a896d313..ab3db9248 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -546,15 +546,29 @@ def get_subdirs_as_module_names(path): # https://github.com/django-cms/djangocms-style DJANGOCMS_STYLE_CHOICES = [ - # https://cep.tacc.utexas.edu/design-system/ui-patterns/o-section/ + # https://dev.tup.tacc.utexas.edu/static/ui/components/detail/c-card--default.html + 'card', + 'card--plain', + 'card--standard', + 'card--image-top', + 'card--image-bottom', + 'card--image-right', + 'card--image-left', + # https://dev.tup.tacc.utexas.edu/static/ui/components/detail/o-section.html + 'section', + 'section--light', + 'section--muted', + 'section--dark', + 'o-section', 'o-section o-section--style-light', + 'o-section o-section--style-muted', 'o-section o-section--style-dark', - # https://cep.tacc.utexas.edu/design-system/ui-patterns/c-callout/ + # https://dev.tup.tacc.utexas.edu/design-system/pattern-library-manual/c-callout/ 'c-callout', - # https://cep.tacc.utexas.edu/design-system/ui-patterns/c-recognition/ + # https://dev.tup.tacc.utexas.edu/design-system/pattern-library-manual/c-recognition/ 'c-recognition c-recognition--style-light', 'c-recognition c-recognition--style-dark', - # https://cep.tacc.utexas.edu/design-system/ui-patterns/c-nav/ + # https://ecepalliance.org/alliance-members/ 'c-nav', # bare-bones instance 'c-nav c-nav--boxed', ] From d3b640ccb73b8c76826b31f59a8821d005347534 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 6 Jan 2023 16:25:14 -0600 Subject: [PATCH 069/137] feat(core-styles): many c-card fixes and updates --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ece96759d..b9211da4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#b15658b62e69a6cb431e295bf5ac68e8563f7b03", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#320641405ecbcb94918c6a7acac0a5488fbf7a51", "dev": true, "license": "MIT", "bin": { @@ -9458,7 +9458,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#b15658b62e69a6cb431e295bf5ac68e8563f7b03", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#320641405ecbcb94918c6a7acac0a5488fbf7a51", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "requires": {} From b0a76244b18862f10063eecaf40d3765766421bf Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 10 Jan 2023 00:29:52 -0600 Subject: [PATCH 070/137] feat(core-styles): c-data-list & data-list This is atop the card & section patterns I've been installing/updating. --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9211da4d..80812c0d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#320641405ecbcb94918c6a7acac0a5488fbf7a51", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#816f74d5eb3958f790b8a2116e2b32270a09c40c", "dev": true, "license": "MIT", "bin": { @@ -9458,7 +9458,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#320641405ecbcb94918c6a7acac0a5488fbf7a51", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#816f74d5eb3958f790b8a2116e2b32270a09c40c", "dev": true, "from": "@tacc/core-styles@github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", "requires": {} From c883ce9162afc39c880c7b674ca8e0747a934912 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 12 Jan 2023 09:43:40 -0600 Subject: [PATCH 071/137] fix: multimedia post custom media setting typo --- taccsite_cms/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 8a168cc2e..9742cd5ed 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -647,6 +647,6 @@ def get_subdirs_as_module_names(path): 'GOOGLE_ANALYTICS_PRELOAD', 'TACC_BLOG_SHOW_CATEGORIES', 'TACC_BLOG_SHOW_TAGS', - 'TACC_CORE_STYLES_VERSION' + 'TACC_CORE_STYLES_VERSION', 'TACC_BLOG_CUSTOM_MEDIA_POST_CATEGORY' ] From f3ea624c3a16d603d7ae1e69ea9b13e7c83221ba Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 13 Jan 2023 16:37:46 -0600 Subject: [PATCH 072/137] fix(core-styles): c-card updates (via dev/tup-cms) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80812c0d8..39a5433f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", + "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#816f74d5eb3958f790b8a2116e2b32270a09c40c", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a8905a3f0bb2a21dec5ef094bd1f068f9c610aaa", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#816f74d5eb3958f790b8a2116e2b32270a09c40c", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a8905a3f0bb2a21dec5ef094bd1f068f9c610aaa", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev/tup-cms", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index ff69f7e36..b7d8ad37e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/update-and-doc-o-section-and-c-card-for-tup", + "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 267105c70da0c762764163b4b3d0ca5685045c1d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 19 Jan 2023 17:10:48 -0600 Subject: [PATCH 073/137] feat(core-styles): base, cms, docs, portal re-org (#586) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39a5433f1..0358ed60a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms", + "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a8905a3f0bb2a21dec5ef094bd1f068f9c610aaa", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#f6a8c8210bf9d1cedb660d933c9f1a2e697c508d", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a8905a3f0bb2a21dec5ef094bd1f068f9c610aaa", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#f6a8c8210bf9d1cedb660d933c9f1a2e697c508d", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev/tup-cms", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index b7d8ad37e..f6682ce72 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms", + "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 987db14f2ef4ba4158774e30a1341fe3091f7e3d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 23 Jan 2023 15:47:39 -0600 Subject: [PATCH 074/137] feat(core-styles): install latest --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0358ed60a..c8962b457 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", + "@tacc/core-styles": "github:TACC/Core-Styles", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#f6a8c8210bf9d1cedb660d933c9f1a2e697c508d", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9984174d5d6d458b701a0a7966bb0412cf404ed2", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#f6a8c8210bf9d1cedb660d933c9f1a2e697c508d", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9984174d5d6d458b701a0a7966bb0412cf404ed2", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", + "from": "@tacc/core-styles@github:TACC/Core-Styles", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index f6682ce72..b5f97009c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dev/tup-cms--task/core-styles-base-cms-docs-portal-cleanup", + "@tacc/core-styles": "github:TACC/Core-Styles", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 7a4d4b96ea818f3e548d860d24beb478d709710b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 23 Jan 2023 15:49:08 -0600 Subject: [PATCH 075/137] feat(css): use core-styles for basic .align styles --- .../components/django.cms.picture.css | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css index 1ff909456..4104df410 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css @@ -1,37 +1,7 @@ -/* -Django CMS Picture +/* To support djangocms-picture plugin unstyled default alignment classes */ +/* SEE: https://github.com/django-cms/djangocms-picture/blob/2.3.0/djangocms_picture/models.py#L24-L34 */ +@import url("@tacc/core-styles/src/lib/_imports/components/align.css"); -Classes from [Django CMS Picture](https://github.com/django-cms/djangocms-picture#readme). - -Reference: - -- [Django CMS Picture `.align-` Classes](https://github.com/django-cms/djangocms-picture/blob/2.3.0/djangocms_picture/models.py#L24-L34) - -Styleguide Components.DjangoCMS.Picture -*/ - - - -/* Default Values */ - -/* Support default alignment classes */ -.align-right, -.align-left { - margin-bottom: var(--global-space--grid-gap); -} -.align-right { - float: right; - margin-left: var(--global-space--grid-gap); -} -.align-left { - float: left; - margin-right: var(--global-space--grid-gap); -} -.align-center { - display: block; - margin-inline: auto; -} - -/* Try to auto clear image floats */ +/* Try to auto-clear image floats */ .align-right + *:not(img) { clear: right } .align-left + *:not(img) { clear: left } From a8d2ef3e90ff19fc9eb469be8cfe51955296c3b4 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 24 Jan 2023 10:56:53 -0600 Subject: [PATCH 076/137] feat(core-styles): pin to installed commit --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c8962b457..391079a0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles", + "@tacc/core-styles": "github:TACC/Core-Styles#9984174", "minimist": "^1.2.6" }, "engines": { @@ -9460,7 +9460,7 @@ "@tacc/core-styles": { "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9984174d5d6d458b701a0a7966bb0412cf404ed2", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles", + "from": "@tacc/core-styles@github:TACC/Core-Styles#9984174", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index b5f97009c..824b231b2 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles", + "@tacc/core-styles": "github:TACC/Core-Styles#9984174", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 591b396ad579937ff19bb80d2102168d2a200389 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 24 Jan 2023 11:43:04 -0600 Subject: [PATCH 077/137] fix(css): manual updates from core-styles I have been syncing django-cms-forms, but neglected this sync. (I am syncing them because they shoudl be here but development is stuck in core-styles until I can create a source of truth that both django-cms-forms and c-form read.) --- .../css/src/_imports/components/django-cms-forms.css | 11 ++--------- ...cms-forms-hacks.css => django-cms-forms.hacks.css} | 0 2 files changed, 2 insertions(+), 9 deletions(-) rename taccsite_cms/static/site_cms/css/src/_imports/components/{django-cms-forms-hacks.css => django-cms-forms.hacks.css} (100%) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css index 50436cda0..aafbfc22b 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.css @@ -2,7 +2,7 @@ @import url("@tacc/core-styles/src/lib/_imports/components/c-message.css"); @import url('@tacc/core-styles/src/lib/_imports/tools/x-link.css'); -@import url("./django-cms-forms-hacks.css"); +@import url("./django-cms-forms.hacks.css"); @@ -82,13 +82,6 @@ ul.checkboxselectmultiple li:last-child label { /* Field: Required, Asterisk, Important */ -.field-wrapper > label { - font-weight: var(--bold); -} -.field-wrapper > label .asterisk { - font-weight: var(--regular); -} - .field-wrapper .asterisk { margin-left: 0.5em; } @@ -143,7 +136,7 @@ ul.checkboxselectmultiple li:last-child label { @extend .c-message; @extend .c-message--type-error; @extend .c-message--scope-section; - @extend .c-message--scope-section.c-message--type-error; + @extend .c-message--type-error.c-message--scope-section; } .field-errors li { @extend .c-message; diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css similarity index 100% rename from taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms-hacks.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-forms.hacks.css From aed86468eb49db1c56fec031e027200737cf8597 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 24 Jan 2023 16:08:24 -0600 Subject: [PATCH 078/137] fix(core-styles): add core-cms docs pseudo-cdn css --- .../static/site_cms/css/src/_core-styles/core-styles.docs.css | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.docs.css diff --git a/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.docs.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.docs.css new file mode 100644 index 000000000..52128d775 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.docs.css @@ -0,0 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ +@import url("@tacc/core-styles/dist/core-styles.docs.css"); From b45285d1553682d195098da3fdc6e75117791935 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 24 Jan 2023 17:20:14 -0600 Subject: [PATCH 079/137] fix(taccsite_ui): load s-drop-cap & x-drop-cap css And explain what is going on. --- .../site_cms/css/src/_imports/tools/x-drop-cap/config.yml | 3 ++- .../static/site_cms/css/src/_imports/trumps/s-drop-cap.css | 1 - taccsite_cms/static/site_cms/css/src/site.cms.css | 2 ++ taccsite_ui/fractal.config.js | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml index 85920abf8..4d6043bc3 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml +++ b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-drop-cap/config.yml @@ -1,2 +1,3 @@ context: - shouldSkipPattern: false + shouldLoadCMS: true + 📝 shouldLoadCMS: because, in CMS, `shouldSkipPattern` "false" would not find stylesheet assets from CMS; but `shouldLoadCMS` lets site.cms.css provide x-drop-cap via s-drop-cap import diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css index 6b932ba88..8297c3778 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-drop-cap.css @@ -1,4 +1,3 @@ -/* This CSS is EXAMPLE code for a client. It is NOT part of the pattern. */ @import url('../tools/x-drop-cap.css'); .s-drop-cap > p:first-of-type::first-letter { diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css index d92a44e00..d2aed46c7 100644 --- a/taccsite_cms/static/site_cms/css/src/site.cms.css +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -11,3 +11,5 @@ @import url("./_imports/components/django-cms-forms.css"); @import url("./_imports/components/django.cms.post.css"); @import url("./_imports/components/django.cms.picture.css"); + +@import url("./_imports/trumps/s-drop-cap.css"); diff --git a/taccsite_ui/fractal.config.js b/taccsite_ui/fractal.config.js index 5880654d6..b176983ee 100644 --- a/taccsite_ui/fractal.config.js +++ b/taccsite_ui/fractal.config.js @@ -51,7 +51,9 @@ if ( projCSSFiles.length > 0 ) { } // Set website paths -fractal.web.set('static.path', __dirname + '/../taccsite_cms/static/site_cms/css/build'); +// FAQ: Setting static.path results in `shouldSkipPattern: false` letting ONLY Core-CMS assets load, because that directory ONLY has Core-CMS assets +// FAQ: Not setting static.path results in `shouldSkipPattern: false` letting ONLY Core-Styles assets load, because Core-Styles cofnig loads ONLY its assets +// fractal.web.set('static.path', __dirname + '/../taccsite_cms/static/site_cms/css/build'); fractal.web.set('builder.dest', __dirname + '/dist'); // Customize theme From 458eda34d409d8cc1e5fd5c8e31768a9823ebb2a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 24 Jan 2023 17:48:15 -0600 Subject: [PATCH 080/137] fix(core-styles): pin to latest commit (has fixes) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 391079a0a..6900fe48b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#9984174", + "@tacc/core-styles": "github:TACC/Core-Styles#ee96b93", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9984174d5d6d458b701a0a7966bb0412cf404ed2", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#ee96b93a17ab38f3d7ce9909fe118e1e3d6bf334", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9984174d5d6d458b701a0a7966bb0412cf404ed2", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#ee96b93a17ab38f3d7ce9909fe118e1e3d6bf334", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#9984174", + "from": "@tacc/core-styles@github:TACC/Core-Styles#ee96b93", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 824b231b2..310578986 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#9984174", + "@tacc/core-styles": "github:TACC/Core-Styles#ee96b93", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 2547d11276417f1b7a1455064076410d0bfeda77 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 25 Jan 2023 23:40:31 -0600 Subject: [PATCH 081/137] =?UTF-8?q?fix(core-styles):=20no=20card=20pattern?= =?UTF-8?q?=20for=20=E2=80=A6portal.css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6900fe48b..fb9b39c23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#ee96b93", + "@tacc/core-styles": "github:TACC/Core-Styles#d8eaee9", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#ee96b93a17ab38f3d7ce9909fe118e1e3d6bf334", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d8eaee9f02e2d172a5acd82916f7f4e1634b9839", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#ee96b93a17ab38f3d7ce9909fe118e1e3d6bf334", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d8eaee9f02e2d172a5acd82916f7f4e1634b9839", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#ee96b93", + "from": "@tacc/core-styles@github:TACC/Core-Styles#d8eaee9", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 310578986..516e43473 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#ee96b93", + "@tacc/core-styles": "github:TACC/Core-Styles#d8eaee9", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From a1370d9e0d1393410148b18a8e62143c26a1f47d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 26 Jan 2023 00:19:31 -0600 Subject: [PATCH 082/137] fix(core-styles): no card pattern in modals Short-term solution. This is faster than refactoring out Reactstrap from tup-ui. The side effect is we can't use cards in modals in CMS, but I don't foresee that being a desired design. --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb9b39c23..2f777e06b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#d8eaee9", + "@tacc/core-styles": "github:TACC/Core-Styles#8e1914f", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#d8eaee9f02e2d172a5acd82916f7f4e1634b9839", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8e1914ff901c77470360eec9a91923ab76ff0cb6", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#d8eaee9f02e2d172a5acd82916f7f4e1634b9839", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8e1914ff901c77470360eec9a91923ab76ff0cb6", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#d8eaee9", + "from": "@tacc/core-styles@github:TACC/Core-Styles#8e1914f", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 516e43473..991b272d0 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#d8eaee9", + "@tacc/core-styles": "github:TACC/Core-Styles#8e1914f", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 5b63663849a1bd9d26ee909e53df3b626f4a83db Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 26 Jan 2023 00:38:27 -0600 Subject: [PATCH 083/137] fix(core-styles): no TACC card for portal, modal Fixes previous two attempts at this. --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f777e06b..f3029e668 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#8e1914f", + "@tacc/core-styles": "github:TACC/Core-Styles#514d272", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8e1914ff901c77470360eec9a91923ab76ff0cb6", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#514d272e17bc9528490f95af1b4395145fb0b8a6", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8e1914ff901c77470360eec9a91923ab76ff0cb6", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#514d272e17bc9528490f95af1b4395145fb0b8a6", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#8e1914f", + "from": "@tacc/core-styles@github:TACC/Core-Styles#514d272", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 991b272d0..07ee02655 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#8e1914f", + "@tacc/core-styles": "github:TACC/Core-Styles#514d272", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From dc0b2be7ba15ac457b2897e674595af075529a5a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 31 Jan 2023 19:09:16 -0600 Subject: [PATCH 084/137] fix(core-styles): unaligned figure image shrink H.P. came across this bug twice: - https://dev.tup.tacc.utexas.edu/partnerships/star-industry-program/ - https://dev.tup.tacc.utexas.edu/use-tacc/visualization-services/ She had to make a fake caption because of the problem. TACC/Core-Styles#120 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3029e668..ff2121a91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#514d272", + "@tacc/core-styles": "github:TACC/Core-Styles#8876a8c", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#514d272e17bc9528490f95af1b4395145fb0b8a6", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8876a8c12680ef14f6a144963167667f3a38cd93", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#514d272e17bc9528490f95af1b4395145fb0b8a6", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8876a8c12680ef14f6a144963167667f3a38cd93", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#514d272", + "from": "@tacc/core-styles@github:TACC/Core-Styles#8876a8c", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 07ee02655..d52d278e8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#514d272", + "@tacc/core-styles": "github:TACC/Core-Styles#8876a8c", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 602ba121ae1911eba74d940f0583d775aa895e96 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:18:08 -0600 Subject: [PATCH 085/137] fix(templates): djangcms_picture, alignment issues (#588) --- package-lock.json | 8 +- package.json | 2 +- .../components/django.cms.blog.app.page.css | 46 ++++++++ .../components/django.cms.picture.css | 34 ++++++ taccsite_cms/static/site_cms/css/src/site.css | 10 +- .../djangocms_picture/default/picture.html | 101 ++++++++++++++++++ 6 files changed, 188 insertions(+), 13 deletions(-) create mode 100644 taccsite_cms/templates/djangocms_picture/default/picture.html diff --git a/package-lock.json b/package-lock.json index ff2121a91..34d91184e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#8876a8c", + "@tacc/core-styles": "github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#8876a8c12680ef14f6a144963167667f3a38cd93", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#e8231f2860a98f5c6aeb74802148a6aa36ce9006", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#8876a8c12680ef14f6a144963167667f3a38cd93", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#e8231f2860a98f5c6aeb74802148a6aa36ce9006", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#8876a8c", + "from": "@tacc/core-styles@github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index d52d278e8..461937b6a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#8876a8c", + "@tacc/core-styles": "github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index 75301ff01..7efe6843c 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -7,6 +7,8 @@ Reference: Styleguide Components.DjangoCMS.Blog.App.Page */ +@import url("@tacc/core-styles/src/lib/_imports/objects/o-offset-content.css"); + @import url("./django.cms.blog.app.page.multimedia.css"); @@ -108,3 +110,47 @@ Styleguide Components.DjangoCMS.Blog.App.Page :--article-page .blog-content li + li { margin-top: 0.5em; } + + + +/* Media & Content - Alignment */ + +:--article-page .blog-content .align-left { + @extend .o-offset-content--left; +} +:--article-page .blog-content .align-right { + @extend .o-offset-content--right; +} +:--article-page .blog-content .align-center { + max-width: 100%; /* overwrite @tacc/core-styles/…/components/align.css */ +} + +/* To remove margin on narrow screens */ +/* To overwrite @tacc/core-styles/…/components/align.css */ +@media (--narrow-and-below) { + :--article-page .blog-content .align-center, + :--article-page .blog-content .align-right, + :--article-page .blog-content .align-left { + max-width: unset; + } + :--article-page .blog-content .align-right, + :--article-page .blog-content .align-left { + float: unset; + margin-bottom: unset; + } + :--article-page .blog-content .align-right { + margin-left: unset; + } + :--article-page .blog-content .align-left { + margin-right: unset; + } +} + +/* To reduce image width on medium screens */ +@media (--narrow-and-above) and (--medium-and-below) { + :--article-page .blog-content .align-center, + :--article-page .blog-content .align-right, + :--article-page .blog-content .align-left { + max-width: 50%; + } +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css index 4104df410..d65dc581f 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.picture.css @@ -3,5 +3,39 @@ @import url("@tacc/core-styles/src/lib/_imports/components/align.css"); /* Try to auto-clear image floats */ +/* WARNING: The commented solution clears float BUT also negates float */ +/* .align-right + *:not(img) { clear: right } .align-left + *:not(img) { clear: left } +*/ + +/* To apply djangocms-bootstrap4/…_picture class styles from parent to image */ +/* FAQ: TACC/Core-CMS moves (side effect) Picture classes to
    or */ +/* SEE: taccsite_cms/templates/djangocms_picture/default/picture.html */ +:is(figure, a).img-fluid img { + max-width: 100%; + height: auto; +} +:is(figure, a).img-thumbnail img { + padding: 0.25rem; + background-color: #fff; + border: 1px solid #dee2e6; + border-radius: 1rem; /* NOTE: Bootstrap used 0.25rem */ + max-width: 100%; + height: auto; +} +:is(figure, a).rounded { + /* NOTE: Bootstrap used 0.25rem */ + border-radius: 1rem !important; /* overwrite Bootstrap (uses !important) */ +} +/* To undo some djangocms-bootstrap4/…_picture class styles on parent */ +/* FAQ: The duplicate styles on parent tags look odd or are unnecessary */ +:is(figure, a).img-thumbnail { + padding: unset; + background-color: unset; + border: unset; + border-radius: unset; +} +:is(figure, a).rounded { + border-radius: unset !important; /* overwrite Bootstrap (uses !important) */ +} diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index ed64b4200..de12c709e 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -26,19 +26,13 @@ /* ELEMENTS */ /* Bootstrap performs much of this */ -@import url("@tacc/core-styles/src/lib/_imports/elements/html-elements.cms.css"); -@import url("@tacc/core-styles/src/lib/_imports/elements/form.cms.css"); +/* Core-Styles provides much of this */ @import url("@tacc/core-styles/src/lib/_imports/elements/links.css"); @import url("@tacc/core-styles/src/lib/_imports/elements/table.css"); /* Load custom element styles within custom element, not here */ /* OBJECTS */ -@import url("_imports/objects/o-grid.css"); -@import url("_imports/objects/o-float-content.css"); -@import url("_imports/objects/o-offset-content.css"); -@import url("_imports/objects/o-section.css"); -@import url("@tacc/core-styles/src/lib/_imports/objects/o-fixed-header-table.css"); -@import url("@tacc/core-styles/src/lib/_imports/objects/o-table-wrap.css"); +/* Core-Styles provides much of this */ /* COMPONENTS */ @import url("@tacc/core-styles/src/lib/_imports/components/c-button.css"); diff --git a/taccsite_cms/templates/djangocms_picture/default/picture.html b/taccsite_cms/templates/djangocms_picture/default/picture.html new file mode 100644 index 000000000..194daada2 --- /dev/null +++ b/taccsite_cms/templates/djangocms_picture/default/picture.html @@ -0,0 +1,101 @@ +{# https://github.com/django-cms/djangocms-picture/blob/3.0.0/djangocms_picture/templates/djangocms_picture/default/picture.html #} +{# TACC (mimic v3.0.0 to v4.0.0 changes): #} +{# {% load thumbnail %} #} +{% load thumbnail l10n %} +{# /TACC #} + +{% if picture_link %} + +{% endif %} + +{# start render figure/figcaption #} +{% if instance.caption_text %} + {# TACC (assign attributes to parent): #} + {#
    #} +
    + {# /TACC #} +{% endif %} +{# end render figure/figcaption #} + + +{# TACC (mimic v3.0.0 to v4.0.0 changes): #} +{% localize off %} +{# /TACC #} +{% if instance.attributes.alt %}{{ instance.attributes.alt }}{% elif instance.picture.default_alt_text %}{{ instance.picture.default_alt_text }}{% endif %} +{# TACC (mimic v3.0.0 to v4.0.0 changes): #} +{% endlocalize %} +{# /TACC #} + +{# start render figure/figcaption #} +{% if instance.caption_text %} +
    {{ instance.caption_text }}
    +
    +{% endif %} +{# end render figure/figcaption #} + +{% if picture_link %} +     +{% endif %} + +{% comment %} + # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img + # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figure + # https://github.com/divio/django-filer/blob/master/filer/models/imagemodels.py + # http://easy-thumbnails.readthedocs.io/en/2.1/usage/#templates + {{ instance.picture }} + # Available variables: + {{ instance.img_src }} + {{ instance.width }} + {{ instance.height }} + {{ instance.alignment }} + {{ instance.caption_text }} + {{ instance.img_srcset_data }} or {{ img_srcset_data }} + {{ instance.attributes_str }} + # picture helper + {{ instance.get_size }} or {{ picture_size }} + # link settings + {{ instance.link_url }} + {{ instance.link_page }} + {{ instance.link_target }} + {{ instance.link_attributes_str }} + # link helper + {{ instance.get_link }} or {{ picture_link }} + # cropping settings + {{ instance.use_automatic_scaling }} + {{ instance.use_no_cropping }} + {{ instance.use_crop }} + {{ instance.use_upscale }} + {{ instance.thumbnail_options }} + # activate DJANGOCMS_PICTURE_NESTING to enable nested plugins: + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} +{% endcomment %} From 6d4d3282a00ac6bff0e33dc19d29359911297d3f Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:29:55 -0600 Subject: [PATCH 086/137] Task/tup 395 cmd news layout switch (#589) --- .../site_cms/js/modules/switchLayout.js | 72 +++++++++++++++++++ .../templates/djangocms_blog/base.html | 1 + .../tacc/layout-choice-form.html | 22 ++++++ 3 files changed, 95 insertions(+) create mode 100644 taccsite_cms/static/site_cms/js/modules/switchLayout.js create mode 100644 taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html diff --git a/taccsite_cms/static/site_cms/js/modules/switchLayout.js b/taccsite_cms/static/site_cms/js/modules/switchLayout.js new file mode 100644 index 000000000..20c3cd1c4 --- /dev/null +++ b/taccsite_cms/static/site_cms/js/modules/switchLayout.js @@ -0,0 +1,72 @@ +/** + * Supported layouts and their class names + * @enum {string} + */ +const LAYOUT_CLASS_DICT = { + grid: 'as-grid', + list: 'as-list', +}; + +/** + * Change class of element based on choice from a form + * @param {HTMLElement} content - The element on which to switch layout class + * @param {HTMLNodeList} formChoices - The elements by which user chooses layout + * @param {object.} [layoutClassDict=LAYOUT_CLASS_DICT] - Class name for each layout + */ +export default function switchLayout( + content, + formChoices, + layoutClassDict = LAYOUT_CLASS_DICT +) { + [ ...formChoices ].forEach( choice => { + choice.addEventListener('click', () => { + const layout = getLayout( formChoices ); + + switchClass( content, layout, layoutClassDict ); + }); + }); +} + +/** + * To get the chosen layout + * @param {HTMLNodeList} formChoices - The elements by which user chooses layout + * @returns {string} + * @see https://stackoverflow.com/a/36894871 + */ +function getLayout(formChoices) { + let layout; + for ( const choice of formChoices ) { + if ( choice.checked ) { + layout = choice.value; + break; + } + } + return layout; +} + +/** + * To change class based on given layout + * @param {HTMLElement} content - The element on which to switch layout class + * @param {string} layout - The layout to use + * @param {object.} [layoutClassDict=LAYOUT_CLASS_DICT] - Class name for each layout + * @see https://stackoverflow.com/a/36894871 + */ +function switchClass( content, layout, layoutClassDict ) { + let layoutClass; + + // Remove unselected + for ( const layoutName in layoutClassDict ) { + if ( layoutName !== layout ) { + layoutClass = layoutClassDict[layoutName]; + content.classList.remove( layoutClass ); + } + } + + // Add selected + if ( layout in layoutClassDict ) { + layoutClass = layoutClassDict[layout]; + content.classList.add( layoutClass ); + } else { + console.info(`The layout "${layout}" is unknown`); + } +} diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html index d8a90f356..7100770c2 100644 --- a/taccsite_cms/templates/djangocms_blog/base.html +++ b/taccsite_cms/templates/djangocms_blog/base.html @@ -29,6 +29,7 @@ app-blog-tag-{{ tag.slug }} {% endfor %}{% endif %} "> + {% include './tacc/layout-choice-form.html' %} {% block content_blog %}{% endblock %}
    {% endblock content %} diff --git a/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html b/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html new file mode 100644 index 000000000..58c9a8633 --- /dev/null +++ b/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html @@ -0,0 +1,22 @@ +{# To support user changing layout of news list #} +{# FAQ: The form is hidden, because styles are not complete #} +{# FAQ: The script is active, so new styles can be tested as a user #} + + From 8f5ed0125c3f4af383504cd9666ff35dc94ae45c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 3 Feb 2023 12:50:48 -0600 Subject: [PATCH 087/137] chore(core-styles): install installed branch merge Install the commit of the merge of the currently-installed branch. --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34d91184e..c51b9755d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", + "@tacc/core-styles": "github:TACC/Core-Styles#dd2bbb0", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#e8231f2860a98f5c6aeb74802148a6aa36ce9006", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#dd2bbb02290aae93f8d90a83eeb1ed4a8941ad15", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#e8231f2860a98f5c6aeb74802148a6aa36ce9006", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#dd2bbb02290aae93f8d90a83eeb1ed4a8941ad15", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", + "from": "@tacc/core-styles@github:TACC/Core-Styles#dd2bbb0", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 461937b6a..8a965af16 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#bugfix/picture-plugin-template-annoyances", + "@tacc/core-styles": "github:TACC/Core-Styles#dd2bbb0", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From c372d663639e60a346dc8f0f74b5fce99f84f902 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:40:54 -0600 Subject: [PATCH 088/137] Task/auto responsive vdeo embed (#590) --- taccsite_cms/settings.py | 1 + .../css/src/_imports/components/django-cms-video.css | 8 ++++++++ taccsite_cms/static/site_cms/css/src/site.cms.css | 1 + .../djangocms_video/responsive-auto/video_player.html | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-video.css create mode 100644 taccsite_cms/templates/djangocms_video/responsive-auto/video_player.html diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 0592f55db..f61b4e1b5 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -601,6 +601,7 @@ def get_subdirs_as_module_names(path): # https://github.com/django-cms/djangocms-video DJANGOCMS_VIDEO_TEMPLATES = [ + ('responsive-auto', _('Responsive - Automatic')), ('responsive-16by9', _('Responsive - 16 by 9')), ('responsive-4by3', _('Responsive - 4 by 3')), ('responsive-1by1', _('Responsive - 1 by 1')), diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-video.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-video.css new file mode 100644 index 000000000..6c80c35b8 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django-cms-video.css @@ -0,0 +1,8 @@ +.embed-responsive:not([class*="embed-responsive-"]) +:is(.embed-responsive-item, embed, iframe, object, video) { + /* To overwrite Bootstrap _embed */ + position: unset; + top: unset; + bottom: unset; + left: unset; +} diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css index d2aed46c7..194485493 100644 --- a/taccsite_cms/static/site_cms/css/src/site.cms.css +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -11,5 +11,6 @@ @import url("./_imports/components/django-cms-forms.css"); @import url("./_imports/components/django.cms.post.css"); @import url("./_imports/components/django.cms.picture.css"); +@import url("./_imports/components/django-cms-video.css"); @import url("./_imports/trumps/s-drop-cap.css"); diff --git a/taccsite_cms/templates/djangocms_video/responsive-auto/video_player.html b/taccsite_cms/templates/djangocms_video/responsive-auto/video_player.html new file mode 100644 index 000000000..f8b46938d --- /dev/null +++ b/taccsite_cms/templates/djangocms_video/responsive-auto/video_player.html @@ -0,0 +1,7 @@ +{% extends "djangocms_video/default/video_player.html" %} + +{% block content_video %} +
    + {{ block.super }} +
    +{% endblock content_video %} From 8fee78151e4229cbab0d79a0a63679cdf42c5061 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:58:56 -0600 Subject: [PATCH 089/137] feat(blog): tup-395, styles (#587) --- package-lock.json | 8 +- package.json | 2 +- .../components/django.cms.blog.app.css | 56 +++++- .../components/django.cms.blog.app.item.css | 183 +++++------------- .../components/django.cms.blog.app.page.css | 48 +++-- .../djangocms_blog/includes/blog_meta.html | 15 +- .../templates/djangocms_blog/post_detail.html | 4 +- .../templates/djangocms_blog/post_list.html | 4 +- 8 files changed, 153 insertions(+), 167 deletions(-) diff --git a/package-lock.json b/package-lock.json index c51b9755d..7cb2ea6ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dd2bbb0", + "@tacc/core-styles": "github:TACC/Core-Styles#391ef74", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#dd2bbb02290aae93f8d90a83eeb1ed4a8941ad15", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#391ef74acee44968040594f6f41f74f144722b7a", "dev": true, "license": "MIT", "bin": { @@ -9458,9 +9458,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#dd2bbb02290aae93f8d90a83eeb1ed4a8941ad15", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#391ef74acee44968040594f6f41f74f144722b7a", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#dd2bbb0", + "from": "@tacc/core-styles@github:TACC/Core-Styles#391ef74", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 8a965af16..5352d3b64 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#dd2bbb0", + "@tacc/core-styles": "github:TACC/Core-Styles#391ef74", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css index fbd49629d..7ada9de3a 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css @@ -33,7 +33,11 @@ Styleguide Components.DjangoCMS.Blog.App @custom-selector :--article article; @custom-selector :--article-page article.post-detail; @custom-selector :--article-list .blog-list; +@custom-selector :--article-list--as-list .blog-list:not(.as-grid); +@custom-selector :--article-list--as-grid .blog-list.as-grid; @custom-selector :--article-item .blog-list article; +@custom-selector :--article-item--in-list .blog-list:not(.as-grid) article; +@custom-selector :--article-item--in-grid .blog-list.as-grid article; @@ -48,11 +52,44 @@ Styleguide Components.DjangoCMS.Blog.App /* Header */ -.blog-list > header { - margin-bottom: var(--blog-item-buffer); +.app-blog header { + --row-meta: 'cats tags' + 'attr attr'; + --row-head: 'head head' + 'subh subh'; + + display: grid; + grid-template-areas: + var(--row-meta) + var(--row-head); +} +:--article-page h1, +:--article-item h3 { grid-area: head } +:--article-page h2, +:--article-item h4 { grid-area: subh } +.app-blog .attrs { grid-area: attr } +.app-blog .categories { grid-area: cats } +.app-blog .tags { grid-area: tags } + +/* To align tags ot the right */ +.app-blog .tags { + justify-content: end; } -ul.post-detail { +/* To conditionally hide tags & categories */ +.app-blog.no-categories:not(.no-tags) header { + --row-meta: 'tags tags' + 'attr attr'; +} +.app-blog.no-tags:not(.no-categories) header { + --row-meta: 'cats cats' + 'attr attr'; +} +.app-blog.no-categories.no-tags header { + --row-meta: 'attr attr'; +} + +.app-blog ul.post-detail { list-style: none; padding-left: 0; /* overwrite html-elements.css */ @@ -71,6 +108,19 @@ ul.post-detail { display: none; } +.app-blog .attrs, +.app-blog .tags, +.app-blog .categories { + display: flex; + flex-direction: row; + gap: 1em; +} +.app-blog .attrs { + justify-content: space-between; +} +.app-blog .date { + order: -1 +} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css index 29e1ad6cd..326859f83 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css @@ -19,16 +19,14 @@ Styleguide Components.DjangoCMS.Blog.App.Item /* List */ -/* To have two columns at certain viewport widths */ -@media (--xx-narrow-to-x-narrow), (--x-narrow-to-narrow) { - :--article-list { - display: grid; - grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); - column-gap: 40px; - } - :--article-list > :where(header, nav) { - grid-column: 1 / -1; - } +/* To have columns for grid */ +:--article-list--as-grid { + display: grid; + grid-template-columns: repeat( auto-fit, minmax(350px, 1fr) ); + column-gap: var(--global-space--pattern-pad); +} +:--article-list--as-grid > :where(header, nav) { + grid-column: 1 / -1; } @@ -44,35 +42,46 @@ Styleguide Components.DjangoCMS.Blog.App.Item :--article-item { display: grid; + column-gap: 50px; /* for horz. space between image and content */ + border-bottom: var(--global-border-width--normal) solid var(--global-color-primary--dark); margin-bottom: var(--blog-item-buffer); padding-bottom: var(--blog-item-buffer); } +:--article-item header { grid-area: head } +:--article-item .blog-visual { grid-area: media } +:--article-item .blog-lead { grid-area: desc } -/* To have vertical layout for narrow viewports */ -@media (--narrow-and-below) { - :--article-item { +.x-blog-grid-item { grid-template-areas: 'media' 'head' 'desc'; /* To prevent content from overflowing cell */ grid-template-columns: minmax(0, 1fr); - } } -/* To have horizontal layout for wide viewports */ -@media (--narrow-and-above) { - :--article-item { +.x-blog-list-item { grid-template-areas: 'media head' 'media desc'; - /* To have shrinkwrapped media and flexible text content */ + /* To shrinkwrap media and flexible text content */ grid-template-columns: minmax(0, max-content) 1fr; + /* To let 'desc' take remaining space (removes gap between head and desc) */ + grid-template-rows: min-content 1fr; +} +@media (--narrow-and-below) { + :--article-item { + @extend .x-blog-grid-item; + } +} +@media (--narrow-and-above) { + :--article-item--in-list { + @extend .x-blog-list-item; + } + :--article-item--in-grid { + @extend .x-blog-grid-item; } } -:--article-item header { grid-area: head } -:--article-item .blog-visual { grid-area: media } -:--article-item .blog-lead { grid-area: desc } @@ -86,117 +95,25 @@ Styleguide Components.DjangoCMS.Blog.App.Item /* Header (Structure) */ :--article-item header { - display: grid; - position: relative; /* for `position: absolute` children */ - - min-width: 0; /* to support truncation */ - - grid-template-areas: - var(--row-one-areas, 'cats tags') - 'attr attr' - 'head subh'; - - /* To truncate 'subh' fully before truncating 'head' */ - /* CAVEAT: 'cats' is truncated but 'tags' never is */ - grid-template-columns: minmax(0, max-content) 1fr; -} -:--article-item h3 { grid-area: head } -:--article-item h4 { grid-area: subh } -:--article-item .attrs { grid-area: attr } -:--article-item .categories { grid-area: cats } -:--article-item .tags { - grid-area: tags; - - /* To span top row and align right */ - justify-content: end; -} - -/* To (optionally) hide tags & categories */ -.app-blog.no-categories.no-tags :--article-item header { - grid-template-areas: - 'head subh' - 'attr attr'; - - margin-bottom: 20px; -} -.app-blog:not(.no-categories.no-tags) :--article-item header { margin-bottom: 5px; } -.app-blog.no-categories:not(.no-tags) :--article-item header { - --row-one-areas: 'tags tags'; -} -.app-blog.no-tags:not(.no-categories) :--article-item header { - --row-one-areas: 'cats cats'; -} /* Header - Title */ -:--article-item h3, -:--article-item h4 { - margin-block: unset; /* overwrite html-elements.css */ - font-size: var(--global-font-size--large); +:--article-item h3 { + margin-bottom: unset; /* overwrite Core-Styles headings--cms.css */ } -:--article-item h3 a, /* truncate a not h3 so :focus-visible is not cropped */ :--article-item h4 { - @extend %x-truncate--one-line; -} -:--article-item h4 { - text-transform: none; /* overwrite html-elements.css */ - - /* To style subtitle differently than title */ - /* CAVEAT: Font-weight change switches to font that has different alignment */ - transform: translateY(2px); /* HACK: tweak vertical alignment */ - font-weight: var(--regular); -} -:--article-item h4::before { - content: ': '; + display: none; } :--article-item h3 a { - display: block; /* to prevent grid blowout */ color: var(--global-color-primary--xx-dark); } -/* Header - Metadata (Structure) */ - -:--article-item .attrs, -:--article-item .tags { - display: flex; - flex-wrap: nowrap; - flex-direction: row; - gap: 2em; -} -:--article-item .tags { align-items: center } - -/* To truncate all metadata */ -:--article-item :is(.byline, .date) { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - - /* To allow truncation */ - min-width: 0; - - /* To limit text to one line */ - height: 1.4em; /* ~ line-height */ - overflow: hidden; -} -:--article-item .date span, -:--article-item .byline a, -:--article-item .tags li, -:--article-item .categories li, -:--article-item .categories::before { @extend %x-truncate--one-line } - -:--article-item .tags:empty, -:--article-item .categories:empty { display: none } - -:--article-item .date { order: -1 } - - - /* Header - Metadata (Skin) */ :--article-item li { @@ -231,32 +148,28 @@ Styleguide Components.DjangoCMS.Blog.App.Item /* Visual */ -:--article-item .blog-visual:not(:empty) { - /* To align any small image inside (useless with some image sizes) */ - display: grid; - align-items: center; - justify-items: center; -} :--article-item .blog-visual:empty { display: none; } -/* To support vertical layouts at narrow viewports */ +/* To support vertical layouts */ +.x-blog-grid-item-image-inner { + max-width: 100%; /* to prevent overflow if column is narrower than image */ + height: auto; /* to preserve ratio if width is reduced (by max-width: 100%) */ + margin-bottom: 15px; /* to add space between image and content */ +} @media (--narrow-and-below) { - :--article-item .blog-visual:not(:empty) { - height: 140px; /* for consistent image height */ - margin-bottom: 15px; - } - :--article-item .blog-visual img { - max-width: 100%; /* to prevent overflow if column is narrower */ - height: auto; /* to maintain aspect ratio if width changes */ + :--article-item { + & .blog-visual img { + @extend .x-blog-grid-item-image-inner; + } } } -/* To support horizontal layouts at wide viewports */ @media (--narrow-and-above) { - :--article-item .blog-visual:not(:empty) { - width: 255px; /* for consistent image width */ - margin-right: 50px; + :--article-item--in-grid { + & .blog-visual img { + @extend .x-blog-grid-item-image-inner; + } } } @@ -268,7 +181,7 @@ Styleguide Components.DjangoCMS.Blog.App.Item :--article-item .blog-lead { @extend %x-truncate--many-lines; - --lines: 3; + --lines: 4; line-height: 1.5; color: var(--global-color-primary--dark); diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index 4171d8e52..e41951c01 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -15,9 +15,11 @@ Styleguide Components.DjangoCMS.Blog.App.Page -/* Variables */ +/* Root */ :--article-page { + --header-buffer: calc( var(--global-space--grid-gap) / 2 ); + max-width: 665px; margin-inline: auto; } @@ -28,29 +30,27 @@ Styleguide Components.DjangoCMS.Blog.App.Page /* Header (Structure) */ -:--article-page .attrs { - display: flex; - justify-content: space-between; +:--article-page header { + grid-template-areas: + var(--row-head) + var(--row-meta); } - +:--article-page header h1, :--article-page header h2 { + margin-bottom: var(--header-buffer); +} +:--article-page header h1 { font-size: var(--global-font-size--xxx-large); } -:--article-page header h3 { - font-style: italic; +:--article-page header h2 { font-weight: normal; font-size: var(--global-font-size--large); } - -:--article-page header :is(h3, h2 + .attrs) { - padding-top: 17px; +:--article-page header :is(h2, h1 + .attrs) { + padding-top: var(--header-buffer); border-top: var(--global-border-width--normal) solid var(--global-color-primary--dark); } -:--article-page .date-published span { - display: none; -} - @@ -116,15 +116,27 @@ Styleguide Components.DjangoCMS.Blog.App.Page /* Media & Content - Alignment */ +/* FAQ: The .align-... classes come from Bootstrap Picture */ +/* FAQ: The .blockquote.text-... classes come from Bootstrap Blockquote */ -:--article-page .blog-content .align-left { +:--article-page .blog-content .align-left, +:--article-page .blog-content .blockquote.text-left { @extend .o-offset-content--left; } -:--article-page .blog-content .align-right { +:--article-page .blog-content .align-right, +:--article-page .blog-content .blockquote.text-right { @extend .o-offset-content--right; } -:--article-page .blog-content .align-center { - max-width: 100%; /* overwrite @tacc/core-styles/…/components/align.css */ +:--article-page .blog-content .blockquote.text-center { + margin-inline: auto; +} + +/* To always align Bootstrap blockquote text left */ +/* FAQ: Boostrap, loaded in foundation layer, used !important */ +@layer foundation { + :--article-page .blog-content .blockquote[class*="text-"] { + text-align: left !important; /* overwrite Bootstrap .text-... !important */ + } } /* To remove margin on narrow screens */ diff --git a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html index 6d1739d4e..0a36fb95e 100644 --- a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html +++ b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html @@ -16,7 +16,9 @@ {% endif %} {# TACC (add class so CSS can target this element): #}
  • - {# /TACC #} + {# TACC (show date if featured otherwise show "Unpublished"): #} + {% if post.date_published %} + {# /TACC #} {# TACC (add and   so whitespace can be stripped): #} {% trans "Published" %}  {# /TACC #} @@ -28,13 +30,20 @@ {# TACC (wrap with {# /TACC #} + {# TACC (show date if featured otherwise show "Unpublished"): #} + {% else %} + {% trans "Unpublished" %} + {% endif %} + {# /TACC #}
    • {% if post.date_featured %} {# TACC (add class so CSS can target this element): #}
  • {# /TACC #} {# TACC (add and   so whitespace can be stripped): #} - {% trans "Published" %}  + {# TACC (fix from text "Published" to text "Featured"): #} + {% trans "Featured" %}  + {# /TACC #} {# /TACC #}
  • {% trans "Uncategorized" %}
    • {% endif %} {# TACC (distinguish categories and tags via class): #} {# TACC (strip whitespace): #} diff --git a/taccsite_cms/templates/djangocms_blog/post_detail.html b/taccsite_cms/templates/djangocms_blog/post_detail.html index eb1d0b279..25c82c46a 100644 --- a/taccsite_cms/templates/djangocms_blog/post_detail.html +++ b/taccsite_cms/templates/djangocms_blog/post_detail.html @@ -15,9 +15,9 @@ {# /TACC #}
    -

    {% render_model post "title" %}

    +

    {% render_model post "title" %}

    {% if post.subtitle %} -

    {% render_model post "subtitle" %}

    +

    {% render_model post "subtitle" %}

    {% endif %} {% block blog_meta %} {% include "djangocms_blog/includes/blog_meta.html" %} diff --git a/taccsite_cms/templates/djangocms_blog/post_list.html b/taccsite_cms/templates/djangocms_blog/post_list.html index 6f4f4673a..9001f656b 100644 --- a/taccsite_cms/templates/djangocms_blog/post_list.html +++ b/taccsite_cms/templates/djangocms_blog/post_list.html @@ -13,13 +13,13 @@
    {% block blog_title %}
    -

    +

    {% if author %}{% trans "Articles by" %} {{ author.get_full_name }} {% elif archive_date %}{% trans "Archive" %} – {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} {% elif tagged_entries %}{% trans "Tag" %} – {{ tagged_entries|capfirst }} {% elif category %}{% trans "Category" %} – {{ category }} {% else %}{% trans "News" %}{% endif %} -

    +
    {% endblock %} {% for post in post_list %} From b1bdde4f92cf6cd521df493a2f4cd0ea2abaa06b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:33:24 -0600 Subject: [PATCH 090/137] feat(djangocms_blog): simple article link & "to be published" (#599) --- .../components/django.cms.blog.app.item.css | 30 ++++++++----------- .../djangocms_blog/includes/blog_meta.html | 8 +++-- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css index 326859f83..d3fb8f750 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css @@ -196,23 +196,17 @@ Styleguide Components.DjangoCMS.Blog.App.Item /* Footer */ -/* If not editing, stretch "read more" atop the article */ -html:not(:--cms-edit-mode) .read-more a:hover { - --outline-offset: var(--blog-item-buffer); - @extend %x-article-link-hover; -} -html:not(:--cms-edit-mode) .read-more a:active { - @extend %x-article-link-active; -} -html:not(:--cms-edit-mode) .read-more { grid-area: 1 / 1 / -1 / -1 } -html:not(:--cms-edit-mode) .read-more { position: relative; } -html:not(:--cms-edit-mode) .read-more a { - @extend %x-article-link-stretch; - @extend %x-article-link-text; -} +/* Use "read more" link to make image clickable */ +.read-more { + /* To take up */ + grid-row-start: 1; + grid-column-start: 1; + grid-row-end: span 2; + + /* To stretch link to cover footer */ + /* TODO: Try to retire `x-article-link-stretch` */ + display: grid; -/* If editing, hide "read more" */ -/* FAQ: User can: edit by double clicking abstract; visit by clicking title */ -html:--cms-edit-mode .read-more { - display: none; + /* To hide link text */ + font-size: 0; } diff --git a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html index 0a36fb95e..96eb4b4c4 100644 --- a/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html +++ b/taccsite_cms/templates/djangocms_blog/includes/blog_meta.html @@ -16,11 +16,13 @@ {% endif %} {# TACC (add class so CSS can target this element): #}
  • - {# TACC (show date if featured otherwise show "Unpublished"): #} + {# TACC (show date if published otherwise show "Unpublished"): #} {% if post.date_published %} {# /TACC #} {# TACC (add and   so whitespace can be stripped): #} - {% trans "Published" %}  + {# TACC ("Published" vs "To be published"): #} + {% if post.publish %}{% trans "Published" %}{% else %}{% trans "To be published" %}{% endif %}  + {# /TACC #} {# /TACC #} {# TACC (wrap with
    • {% endblock content %} diff --git a/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html b/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html index 58c9a8633..07d223046 100644 --- a/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html +++ b/taccsite_cms/templates/djangocms_blog/tacc/layout-choice-form.html @@ -1,3 +1,5 @@ +{# @var list_selector #} + {# To support user changing layout of news list #} {# FAQ: The form is hidden, because styles are not complete #} {# FAQ: The script is active, so new styles can be tested as a user #} @@ -15,7 +17,9 @@ import switchLayout from '/static/site_cms/js/modules/switchLayout.js'; const form = document.getElementById('layout-choice'); - const content = document.getElementsByClassName('blog-list')[0]; + const content = document.querySelector( + '{{ list_selector|default:".blog-list" }}' + ); const formChoices = form.querySelectorAll('input[name="layout"]'); switchLayout( content, formChoices ); From 9ae0ea4d2e134811c10f7ccb2553347066a7fd58 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 21 Mar 2023 14:17:44 -0500 Subject: [PATCH 120/137] fix(tup-cms): user news read page header layout --- .../src/_imports/components/django.cms.blog.app.page.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index deb925af8..fd0e8f01b 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -32,8 +32,11 @@ Styleguide Components.DjangoCMS.Blog.App.Page :--article-page header { grid-template-areas: - var(--row-head) - var(--row-meta); + 'head' + 'subh' + 'cats' + 'tags' + 'attr'; } :--article-page header h1, :--article-page header h2 { From 3d25c6f578e929e538b15d474483767207bdd57b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 21 Mar 2023 14:23:01 -0500 Subject: [PATCH 121/137] fix(css): blog/news title to be regular link color --- .../css/src/_imports/components/django.cms.blog.app.item.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css index 39a5da9fb..e22ed70bb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.item.css @@ -109,10 +109,6 @@ Styleguide Components.DjangoCMS.Blog.App.Item :--article-item h3 { margin-bottom: unset; /* overwrite Core-Styles headings--cms.css */ } -:--article-item h3 a { - color: var(--global-color-primary--xx-dark); -} - :--article-item h4 { display: none; } From 52d245bb32adbfbc6ad3eea3e5e383ef4515d3eb Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 21 Mar 2023 18:48:53 -0500 Subject: [PATCH 122/137] feat(core-styles): v2.6.0 - c-tag - c-island - --global-font-size--xxx-large - core-styles.wysiwyg.css --- 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 644523751..3a084abff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^2.5.0", + "@tacc/core-styles": "^2.6.1", "minimist": "^1.2.6" }, "engines": { @@ -510,9 +510,9 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.5.0.tgz", - "integrity": "sha512-CpoC7SlzWTMZ+MWJOihdChpMnv/7ukFjUPPW511CoC+C2D7GEz+d5SVzlSnPnnX6sSanR50T3hfsoJsd4ovXlw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.1.tgz", + "integrity": "sha512-tdwX4GiDqLWdfZNPb/zRNfs1MhMGStd4xfL5vSwwG117b5WugSZySkE3pfYwIK3ianemPFxzheuqfLTGlFYDVQ==", "dev": true, "bin": { "core-styles": "src/cli.js" @@ -9474,9 +9474,9 @@ } }, "@tacc/core-styles": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.5.0.tgz", - "integrity": "sha512-CpoC7SlzWTMZ+MWJOihdChpMnv/7ukFjUPPW511CoC+C2D7GEz+d5SVzlSnPnnX6sSanR50T3hfsoJsd4ovXlw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.1.tgz", + "integrity": "sha512-tdwX4GiDqLWdfZNPb/zRNfs1MhMGStd4xfL5vSwwG117b5WugSZySkE3pfYwIK3ianemPFxzheuqfLTGlFYDVQ==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index a3fe604e9..80f596e6b 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^2.5.0", + "@tacc/core-styles": "^2.6.1", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 4f8cd084d29efe6540acbd5bd79a75020e32c61b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 24 Mar 2023 10:12:12 -0500 Subject: [PATCH 123/137] fix: portal nav not to touch cms menu if no search --- taccsite_cms/templates/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html index d6e31b73e..3a3390de7 100644 --- a/taccsite_cms/templates/header.html +++ b/taccsite_cms/templates/header.html @@ -22,10 +22,10 @@ {# GL-6: Remove need for different `className` values #} {% if settings.INCLUDES_PORTAL_NAV or settings.INCLUDES_SEARCH_BAR %} {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #} - {% include "nav_cms.html" with className="navbar-nav" %} + {% include "nav_cms.html" with className="navbar-nav mr-auto" %} {# NOTE: As of 2022-10, search is only available with a Portal #} - {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline ml-auto" settings=settings only %}{% endif %} + {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline" settings=settings only %}{% endif %} {% if settings.INCLUDES_PORTAL_NAV %}{% include "nav_portal.html" with className="navbar-nav" settings=settings only %}{% endif %} {% else %} {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #} From 6d1bf61d979922f6b4582f49b036763bd373683e Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 24 Mar 2023 10:36:19 -0500 Subject: [PATCH 124/137] fix: portal nav not to touch cms menu if no search (#615) --- taccsite_cms/templates/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html index d6e31b73e..3a3390de7 100644 --- a/taccsite_cms/templates/header.html +++ b/taccsite_cms/templates/header.html @@ -22,10 +22,10 @@ {# GL-6: Remove need for different `className` values #} {% if settings.INCLUDES_PORTAL_NAV or settings.INCLUDES_SEARCH_BAR %} {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #} - {% include "nav_cms.html" with className="navbar-nav" %} + {% include "nav_cms.html" with className="navbar-nav mr-auto" %} {# NOTE: As of 2022-10, search is only available with a Portal #} - {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline ml-auto" settings=settings only %}{% endif %} + {% if settings.INCLUDES_SEARCH_BAR %}{% include "nav_search.html" with className="form-inline" settings=settings only %}{% endif %} {% if settings.INCLUDES_PORTAL_NAV %}{% include "nav_portal.html" with className="navbar-nav" settings=settings only %}{% endif %} {% else %} {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #} From 27113db7d479dbbcd4dd207a44520b33d0bbac9c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 28 Mar 2023 14:55:32 -0500 Subject: [PATCH 125/137] chore(core-styles): commit 675e5d5 feat: bootstrap modal styles (#147) --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a084abff..9cc3e104a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^2.6.1", + "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", "minimist": "^1.2.6" }, "engines": { @@ -511,9 +511,9 @@ }, "node_modules/@tacc/core-styles": { "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.1.tgz", - "integrity": "sha512-tdwX4GiDqLWdfZNPb/zRNfs1MhMGStd4xfL5vSwwG117b5WugSZySkE3pfYwIK3ianemPFxzheuqfLTGlFYDVQ==", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", "dev": true, + "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -9474,10 +9474,9 @@ } }, "@tacc/core-styles": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.1.tgz", - "integrity": "sha512-tdwX4GiDqLWdfZNPb/zRNfs1MhMGStd4xfL5vSwwG117b5WugSZySkE3pfYwIK3ianemPFxzheuqfLTGlFYDVQ==", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", "dev": true, + "from": "@tacc/core-styles@github:TACC/Core-Styles#675e5d5", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index 80f596e6b..d8668444f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^2.6.1", + "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 664a259b8d5268416e95bdfcc385b6ec5537324a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 30 Mar 2023 15:36:42 -0500 Subject: [PATCH 126/137] feat(css): wider articles, reskin figures & quotes - changed news articles to be wider - added styles for figure and blockquote and captions --- .../components/django.cms.blog.app.page.css | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index fd0e8f01b..0f8cdfd81 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -8,6 +8,8 @@ Reference: Styleguide Components.DjangoCMS.Blog.App.Page */ @import url("@tacc/core-styles/src/lib/_imports/objects/o-offset-content.css"); +@import url("@tacc/core-styles/src/lib/_imports/tools/x-figure.css"); +@import url("@tacc/core-styles/src/lib/_imports/tools/x-blockquote.css"); @import url("./django.cms.blog.app.page.multimedia.css"); @@ -20,7 +22,7 @@ Styleguide Components.DjangoCMS.Blog.App.Page :--article-page { --header-buffer: calc( var(--global-space--grid-gap) / 2 ); - max-width: 665px; + max-width: 775px; margin-inline: auto; } @@ -181,3 +183,41 @@ Styleguide Components.DjangoCMS.Blog.App.Page max-width: 50%; } } + + + + + +/* Components & Elements */ + +/* To style elements that are or have captions */ +:--article-page { + & figure, + & p.caption, + & .embed-responsive { + @extend .x-figure; + } + & figcaption, + & p.caption { + @extend .x-figure-caption; + } + + & blockquote { + @extend .x-blockquote; + } + & blockquote footer { + @extend .x-blockquote-caption; + } +} + +/* To fix caption styles for `.embed-responsive` */ +:--article-page { + /* To hide `.embed-…` margin-bottom */ + & .embed-responsive + p.caption { + margin-top: calc( var(--buffer-middle) - var(--buffer-below) ); + } + /* To remove extra whitespace beneath embeded content */ + & .embed-responsive > * { + display: block; + } +} From 0143ddd9b81bfff88c71e6cef8b1caa105443196 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 30 Mar 2023 16:59:24 -0500 Subject: [PATCH 127/137] feat(css): install related core-styles branch https://github.com/TACC/Core-Styles/pull/150 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cc3e104a..7370868a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "2.6.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#b7ec2dbc3c0923bb9778269aea89fe7af3e1f107", "dev": true, "license": "MIT", "bin": { @@ -9474,9 +9474,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#b7ec2dbc3c0923bb9778269aea89fe7af3e1f107", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#675e5d5", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index d8668444f..b358b1e4e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 4b7c35bc9a9d47505d124cf95123238656f75c6c Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 31 Mar 2023 11:01:17 -0500 Subject: [PATCH 128/137] fix: default TACC_CORE_STYLES_VERSION to 2 not 0 The default should be 2, because anyone loading CMS beyond v3.9.2 has package.json pointed to a Core-Styles v2. How to make TACC_CORE_STYLES_VERSION = 0 __really_ work (given one `package.json`)? I don't know. That is for TACC/Core-CMS#605 to solve. --- taccsite_cms/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index cb2bf193e..2865b7c61 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -272,7 +272,7 @@ def gettext(s): return s # Only use integer numbers (not "v1", not "0.11.0"), # so templates can load based on simple comparisons -TACC_CORE_STYLES_VERSION = 0 +TACC_CORE_STYLES_VERSION = 2 ######################## # CLIENT BUILD SETTINGS From 55d86acc4ce56b414cd7309c88fac4e50d5337a5 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 31 Mar 2023 15:34:04 -0500 Subject: [PATCH 129/137] test(core-styles): change default accent color (#617) core-styles.base.css defaults to blue accent color --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cc3e104a..665d4b9c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "github:TACC/Core-Styles#task/accent-color-from-purple-to-blue", "minimist": "^1.2.6" }, "engines": { @@ -511,7 +511,7 @@ }, "node_modules/@tacc/core-styles": { "version": "2.6.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9fd865963c119e59231f9893deb6be524b5ec5d2", "dev": true, "license": "MIT", "bin": { @@ -9474,9 +9474,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9fd865963c119e59231f9893deb6be524b5ec5d2", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#675e5d5", + "from": "@tacc/core-styles@github:TACC/Core-Styles#task/accent-color-from-purple-to-blue", "requires": {} }, "@trysound/sax": { diff --git a/package.json b/package.json index d8668444f..39bd56e5f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "github:TACC/Core-Styles#task/accent-color-from-purple-to-blue", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 876dbf4af83d336bd03ed810560cd0ebabab2dae Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 3 Apr 2023 12:34:22 -0500 Subject: [PATCH 130/137] fix(css): no mix postcss nested, seletctor, extend Do not mix usage of these plugins: - postcss-nested - postcss-custom-seletctor - postcss-extend It is unclear which is to blame, but postcss-extend is the oldest and is for a dead feature proposal. --- .../components/django.cms.blog.app.page.css | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index 0f8cdfd81..51323a3f3 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -191,33 +191,29 @@ Styleguide Components.DjangoCMS.Blog.App.Page /* Components & Elements */ /* To style elements that are or have captions */ -:--article-page { - & figure, - & p.caption, - & .embed-responsive { - @extend .x-figure; - } - & figcaption, - & p.caption { - @extend .x-figure-caption; - } +:--article-page figure, +:--article-page p.caption, +:--article-page .embed-responsive { + @extend .x-figure; +} +:--article-page figcaption, +:--article-page p.caption { + @extend .x-figure-caption; +} - & blockquote { - @extend .x-blockquote; - } - & blockquote footer { - @extend .x-blockquote-caption; - } +:--article-page blockquote { + @extend .x-blockquote; +} +:--article-page blockquote footer { + @extend .x-blockquote-caption; } /* To fix caption styles for `.embed-responsive` */ -:--article-page { +:--article-page .embed-responsive + p.caption { /* To hide `.embed-…` margin-bottom */ - & .embed-responsive + p.caption { - margin-top: calc( var(--buffer-middle) - var(--buffer-below) ); - } + margin-top: calc( var(--buffer-middle) - var(--buffer-below) ); +} +:--article-page .embed-responsive > * { /* To remove extra whitespace beneath embeded content */ - & .embed-responsive > * { - display: block; - } + display: block; } From 829030d42ac05638a0d7af9fc05809425849b0e4 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 4 Apr 2023 14:19:53 -0500 Subject: [PATCH 131/137] feat(css): migrate tup-cms styles to core-cms (part 2) (#620) * fix(core-styles): x-figure, x-blockquote mistakes * fix(css): remove cruft fixes for p.caption * fix(css): p.caption not to inherit from .x-figure This was confusing. And undoing this gives p.cation larger margin-bottom (from p). * fix(css): p.caption no inherit .x-figure FOR REAL * chore(core-styles): install v2.6.2 --- package-lock.json | 179 ++++++++++-------- package.json | 2 +- .../components/django.cms.blog.app.page.css | 8 +- 3 files changed, 98 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index f08d4d967..d38dca149 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", + "@tacc/core-styles": "^2.6.2", "minimist": "^1.2.6" }, "engines": { @@ -317,9 +317,9 @@ } }, "node_modules/@csstools/selector-specificity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz", - "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", "dev": true, "peer": true, "engines": { @@ -330,7 +330,6 @@ "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4", "postcss-selector-parser": "^6.0.10" } }, @@ -510,10 +509,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.6.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#0b5bb866beaffddc5ede6322748cbdc36510720e", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", + "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", "dev": true, - "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -793,9 +792,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { @@ -809,8 +808,8 @@ ], "peer": true, "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -1307,9 +1306,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001460", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz", - "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==", + "version": "1.0.30001474", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz", + "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==", "dev": true, "funding": [ { @@ -1319,6 +1318,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "peer": true @@ -1890,9 +1893,9 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", - "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", + "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", "dev": true, "peer": true, "engines": { @@ -1982,9 +1985,9 @@ } }, "node_modules/cssdb": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz", - "integrity": "sha512-0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.5.3.tgz", + "integrity": "sha512-NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ==", "dev": true, "peer": true, "funding": { @@ -2145,13 +2148,6 @@ "node": ">=4.0.0" } }, - "node_modules/deep-get-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-get-set/-/deep-get-set-1.1.1.tgz", - "integrity": "sha512-dBrY4GeR55KfyF9Ipswif/Et4muInKpXkf3ro9hFT/8OdPMVsEGNSfuGzfBv/dJKKwKSqInoZGKV5f40bA7TJA==", - "dev": true, - "peer": true - }, "node_modules/defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -2395,9 +2391,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.320", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz", - "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==", + "version": "1.4.351", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.351.tgz", + "integrity": "sha512-W35n4jAsyj6OZGxeWe+gA6+2Md4jDO19fzfsRKEt3DBwIdlVTT8O9Uv8ojgUAoQeXASdgG9zMU+8n8Xg/W6dRQ==", "dev": true, "peer": true }, @@ -4756,10 +4752,16 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "peer": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -5074,6 +5076,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "peer": true, + "engines": { + "node": ">= 10.12.0" + } + }, "node_modules/object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -5491,9 +5503,9 @@ } }, "node_modules/postcss-cli/node_modules/fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "peer": true, "dependencies": { @@ -6609,14 +6621,14 @@ } }, "node_modules/postcss-replace": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.0.tgz", - "integrity": "sha512-8d64/c/dJL2/zjnQvCD1/eH04xMreXFHdC9F0APl/M7Cg0KyLvN+f/HCb87jbyG1dyIbR4zD7sxl/W4JIp9ppQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.1.tgz", + "integrity": "sha512-T83GVovCkBQkFCTmuid0B2bWNu/O0Bh/HDMeEGFC62EwMvVBLZQFYM7iBbcGT48QDXSNSX6e/X1Q7/Syh5NFng==", "dev": true, "peer": true, "dependencies": { - "deep-get-set": "^1.1.1", - "kind-of": "^6.0.3" + "kind-of": "^6.0.3", + "object-path": "^0.11.8" }, "engines": { "node": "^12 || ^14 || >=16" @@ -9318,9 +9330,9 @@ "requires": {} }, "@csstools/selector-specificity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz", - "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", "dev": true, "peer": true, "requires": {} @@ -9474,9 +9486,10 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#0b5bb866beaffddc5ede6322748cbdc36510720e", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", + "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", "requires": {} }, "@trysound/sax": { @@ -9672,14 +9685,14 @@ "dev": true }, "autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "peer": true, "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -10076,9 +10089,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001460", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz", - "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==", + "version": "1.0.30001474", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz", + "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==", "dev": true, "peer": true }, @@ -10523,9 +10536,9 @@ } }, "css-declaration-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", - "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", + "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", "dev": true, "peer": true, "requires": {} @@ -10581,9 +10594,9 @@ "peer": true }, "cssdb": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz", - "integrity": "sha512-0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.5.3.tgz", + "integrity": "sha512-NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ==", "dev": true, "peer": true }, @@ -10701,13 +10714,6 @@ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, - "deep-get-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-get-set/-/deep-get-set-1.1.1.tgz", - "integrity": "sha512-dBrY4GeR55KfyF9Ipswif/Et4muInKpXkf3ro9hFT/8OdPMVsEGNSfuGzfBv/dJKKwKSqInoZGKV5f40bA7TJA==", - "dev": true, - "peer": true - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -10894,9 +10900,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.320", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz", - "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==", + "version": "1.4.351", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.351.tgz", + "integrity": "sha512-W35n4jAsyj6OZGxeWe+gA6+2Md4jDO19fzfsRKEt3DBwIdlVTT8O9Uv8ojgUAoQeXASdgG9zMU+8n8Xg/W6dRQ==", "dev": true, "peer": true }, @@ -12711,9 +12717,9 @@ "dev": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, "peer": true }, @@ -12942,6 +12948,13 @@ "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", "dev": true }, + "object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "peer": true + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -13241,9 +13254,9 @@ }, "dependencies": { "fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "peer": true, "requires": { @@ -13946,14 +13959,14 @@ } }, "postcss-replace": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.0.tgz", - "integrity": "sha512-8d64/c/dJL2/zjnQvCD1/eH04xMreXFHdC9F0APl/M7Cg0KyLvN+f/HCb87jbyG1dyIbR4zD7sxl/W4JIp9ppQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.1.tgz", + "integrity": "sha512-T83GVovCkBQkFCTmuid0B2bWNu/O0Bh/HDMeEGFC62EwMvVBLZQFYM7iBbcGT48QDXSNSX6e/X1Q7/Syh5NFng==", "dev": true, "peer": true, "requires": { - "deep-get-set": "^1.1.1", - "kind-of": "^6.0.3" + "kind-of": "^6.0.3", + "object-path": "^0.11.8" } }, "postcss-replace-overflow-wrap": { diff --git a/package.json b/package.json index b358b1e4e..32265338d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#task/migrate-tup-cms-styles-to-core-styles", + "@tacc/core-styles": "^2.6.2", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index 51323a3f3..df724a8eb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -192,7 +192,6 @@ Styleguide Components.DjangoCMS.Blog.App.Page /* To style elements that are or have captions */ :--article-page figure, -:--article-page p.caption, :--article-page .embed-responsive { @extend .x-figure; } @@ -208,12 +207,7 @@ Styleguide Components.DjangoCMS.Blog.App.Page @extend .x-blockquote-caption; } -/* To fix caption styles for `.embed-responsive` */ -:--article-page .embed-responsive + p.caption { - /* To hide `.embed-…` margin-bottom */ - margin-top: calc( var(--buffer-middle) - var(--buffer-below) ); -} +/* To remove extra whitespace beneath embeded content */ :--article-page .embed-responsive > * { - /* To remove extra whitespace beneath embeded content */ display: block; } From 07c052b1767614dd4a73a89469a7e35c32f91a72 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 4 Apr 2023 14:24:39 -0500 Subject: [PATCH 132/137] chore(core-styles): install v2.6.2 --- package-lock.json | 179 +++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 97 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cc3e104a..d38dca149 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "^2.6.2", "minimist": "^1.2.6" }, "engines": { @@ -317,9 +317,9 @@ } }, "node_modules/@csstools/selector-specificity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz", - "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", "dev": true, "peer": true, "engines": { @@ -330,7 +330,6 @@ "url": "https://opencollective.com/csstools" }, "peerDependencies": { - "postcss": "^8.4", "postcss-selector-parser": "^6.0.10" } }, @@ -510,10 +509,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.6.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", + "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", "dev": true, - "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -793,9 +792,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { @@ -809,8 +808,8 @@ ], "peer": true, "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -1307,9 +1306,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001460", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz", - "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==", + "version": "1.0.30001474", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz", + "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==", "dev": true, "funding": [ { @@ -1319,6 +1318,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "peer": true @@ -1890,9 +1893,9 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", - "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", + "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", "dev": true, "peer": true, "engines": { @@ -1982,9 +1985,9 @@ } }, "node_modules/cssdb": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz", - "integrity": "sha512-0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.5.3.tgz", + "integrity": "sha512-NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ==", "dev": true, "peer": true, "funding": { @@ -2145,13 +2148,6 @@ "node": ">=4.0.0" } }, - "node_modules/deep-get-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-get-set/-/deep-get-set-1.1.1.tgz", - "integrity": "sha512-dBrY4GeR55KfyF9Ipswif/Et4muInKpXkf3ro9hFT/8OdPMVsEGNSfuGzfBv/dJKKwKSqInoZGKV5f40bA7TJA==", - "dev": true, - "peer": true - }, "node_modules/defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -2395,9 +2391,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.320", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz", - "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==", + "version": "1.4.351", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.351.tgz", + "integrity": "sha512-W35n4jAsyj6OZGxeWe+gA6+2Md4jDO19fzfsRKEt3DBwIdlVTT8O9Uv8ojgUAoQeXASdgG9zMU+8n8Xg/W6dRQ==", "dev": true, "peer": true }, @@ -4756,10 +4752,16 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "peer": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -5074,6 +5076,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "peer": true, + "engines": { + "node": ">= 10.12.0" + } + }, "node_modules/object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -5491,9 +5503,9 @@ } }, "node_modules/postcss-cli/node_modules/fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "peer": true, "dependencies": { @@ -6609,14 +6621,14 @@ } }, "node_modules/postcss-replace": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.0.tgz", - "integrity": "sha512-8d64/c/dJL2/zjnQvCD1/eH04xMreXFHdC9F0APl/M7Cg0KyLvN+f/HCb87jbyG1dyIbR4zD7sxl/W4JIp9ppQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.1.tgz", + "integrity": "sha512-T83GVovCkBQkFCTmuid0B2bWNu/O0Bh/HDMeEGFC62EwMvVBLZQFYM7iBbcGT48QDXSNSX6e/X1Q7/Syh5NFng==", "dev": true, "peer": true, "dependencies": { - "deep-get-set": "^1.1.1", - "kind-of": "^6.0.3" + "kind-of": "^6.0.3", + "object-path": "^0.11.8" }, "engines": { "node": "^12 || ^14 || >=16" @@ -9318,9 +9330,9 @@ "requires": {} }, "@csstools/selector-specificity": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz", - "integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", "dev": true, "peer": true, "requires": {} @@ -9474,9 +9486,10 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#675e5d596cf7aaa88fcc16196fda3a97427dcab8", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz", + "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#675e5d5", "requires": {} }, "@trysound/sax": { @@ -9672,14 +9685,14 @@ "dev": true }, "autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "peer": true, "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -10076,9 +10089,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001460", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz", - "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==", + "version": "1.0.30001474", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz", + "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==", "dev": true, "peer": true }, @@ -10523,9 +10536,9 @@ } }, "css-declaration-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", - "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", + "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", "dev": true, "peer": true, "requires": {} @@ -10581,9 +10594,9 @@ "peer": true }, "cssdb": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz", - "integrity": "sha512-0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.5.3.tgz", + "integrity": "sha512-NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ==", "dev": true, "peer": true }, @@ -10701,13 +10714,6 @@ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, - "deep-get-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-get-set/-/deep-get-set-1.1.1.tgz", - "integrity": "sha512-dBrY4GeR55KfyF9Ipswif/Et4muInKpXkf3ro9hFT/8OdPMVsEGNSfuGzfBv/dJKKwKSqInoZGKV5f40bA7TJA==", - "dev": true, - "peer": true - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -10894,9 +10900,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.320", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz", - "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==", + "version": "1.4.351", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.351.tgz", + "integrity": "sha512-W35n4jAsyj6OZGxeWe+gA6+2Md4jDO19fzfsRKEt3DBwIdlVTT8O9Uv8ojgUAoQeXASdgG9zMU+8n8Xg/W6dRQ==", "dev": true, "peer": true }, @@ -12711,9 +12717,9 @@ "dev": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, "peer": true }, @@ -12942,6 +12948,13 @@ "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", "dev": true }, + "object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "peer": true + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -13241,9 +13254,9 @@ }, "dependencies": { "fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "peer": true, "requires": { @@ -13946,14 +13959,14 @@ } }, "postcss-replace": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.0.tgz", - "integrity": "sha512-8d64/c/dJL2/zjnQvCD1/eH04xMreXFHdC9F0APl/M7Cg0KyLvN+f/HCb87jbyG1dyIbR4zD7sxl/W4JIp9ppQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/postcss-replace/-/postcss-replace-2.0.1.tgz", + "integrity": "sha512-T83GVovCkBQkFCTmuid0B2bWNu/O0Bh/HDMeEGFC62EwMvVBLZQFYM7iBbcGT48QDXSNSX6e/X1Q7/Syh5NFng==", "dev": true, "peer": true, "requires": { - "deep-get-set": "^1.1.1", - "kind-of": "^6.0.3" + "kind-of": "^6.0.3", + "object-path": "^0.11.8" } }, "postcss-replace-overflow-wrap": { diff --git a/package.json b/package.json index d8668444f..32265338d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.14", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "github:TACC/Core-Styles#675e5d5", + "@tacc/core-styles": "^2.6.2", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", From 44cc9a2b7e54f130b88b3473aad2525d027f424d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Wed, 5 Apr 2023 18:16:26 -0500 Subject: [PATCH 133/137] fix: add+use core-styles.wysiwyg.css not copied code (#618) * fix: add+use core-styles.wysiwyg.css, no copy code Create a `core-styles.wysiwyg.css` to load that code from installed Core-Styles (rather than rely on copied code). * fix(...ckeditor): only use @import in contents.css --- .../static/djangocms_text_ckeditor/ckeditor/contents.css | 8 ++------ .../ckeditor/contents.original.css | 2 ++ .../site_cms/css/src/_core-styles/core-styles.wysiwyg.css | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.original.css create mode 100644 taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.wysiwyg.css diff --git a/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.css b/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.css index b79b71db8..09b7ce231 100644 --- a/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.css +++ b/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.css @@ -1,7 +1,3 @@ -/*! https://github.com/django-cms/djangocms-text-ckeditor/blob/3.10.0/djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/contents.css */ -body {font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size: 12px;color: #333;background-color: #fff;margin: 20px;}.cke_editable {font-size: 13px;line-height: 1.6;word-wrap: break-word;}blockquote {font-style: italic;font-family: Georgia, Times, "Times New Roman", serif;padding: 2px 0;border-style: solid;border-color: #ccc;border-width: 0;}.cke_contents_ltr blockquote {padding-left: 20px;padding-right: 8px;border-left-width: 5px;}.cke_contents_rtl blockquote {padding-left: 8px;padding-right: 20px;border-right-width: 5px;}a {color: #0782C1;}ol,ul,dl {*margin-right: 0px;padding: 0 40px;}h1,h2,h3,h4,h5,h6 {font-weight: normal;line-height: 1.2;}hr {border: 0px;border-top: 1px solid #ccc;}img.right {border: 1px solid #ccc;float: right;margin-left: 15px;padding: 5px;}img.left {border: 1px solid #ccc;float: left;margin-right: 15px;padding: 5px;}pre {white-space: pre-wrap;word-wrap: break-word;-moz-tab-size: 4;tab-size: 4;}.marker {background-color: Yellow;}span[lang] {font-style: italic;}figure {text-align: center;outline: solid 1px #ccc;background: rgba(0,0,0,0.05);padding: 10px;margin: 10px 20px;display: inline-block;}figure > figcaption {text-align: center;display: block;}a > img {padding: 1px;margin: 1px;border: none;outline: 1px solid #0782C1;}.code-featured {border: 5px solid red;}.math-featured {padding: 20px;box-shadow: 0 0 2px rgba(200, 0, 0, 1);background-color: rgba(255, 0, 0, 0.05);margin: 10px;}.image-clean {border: 0;background: none;padding: 0;}.image-clean > figcaption {font-size: .9em;text-align: right;}.image-grayscale {background-color: white;color: #666;}.image-grayscale img, img.image-grayscale {filter: grayscale(100%);}.embed-240p {max-width: 426px;max-height: 240px;margin:0 auto;}.embed-360p {max-width: 640px;max-height: 360px;margin:0 auto;}.embed-480p {max-width: 854px;max-height: 480px;margin:0 auto;}.embed-720p {max-width: 1280px;max-height: 720px;margin:0 auto;}.embed-1080p {max-width: 1920px;max-height: 1080px;margin:0 auto;} +@import url("/static/djangocms_text_ckeditor/ckeditor/contents.original.css"); -/*! @tacc/core-styles 2.6.1+ | MIT | github.com/TACC/Core-Styles */@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"); -/*! core-styles.wysiwig.css */ -/*! core-styles.settings.css → */:root{--global-border-width--normal:1px;--global-border--normal:var(--global-border-width--normal) solid var(--global-color-primary--normal);--global-border-width--thick:2px;--global-border--thick:var(--global-border-width--thick) solid var(--global-color-primary--normal);--global-border-width--x-thick:3px;--global-border--x-thick:var(--global-border-width--x-thick) solid var(--global-color-primary--normal)}:root{--global-color-primary--xx-light:#fff;--global-color-primary--xx-light-rgb:255,255,255;--global-color-primary--x-light:#f4f4f4;--global-color-primary--x-light-rgb:244,244,244;--global-color-primary--light:#d7d7d7;--global-color-primary--light-rgb:198,198,198;--global-color-primary--normal:#afafaf;--global-color-primary--normal-rgb:175,175,175;--global-color-primary--dark:#707070;--global-color-primary--dark-rgb:112,112,112;--global-color-primary--x-dark:#484848;--global-color-primary--x-dark-rgb:72,72,72;--global-color-primary--xx-dark:#222;--global-color-primary--xx-dark-rgb:34,34,34;--global-color-primary--xxx-dark:#000;--global-color-primary--xxx-dark-rgb:0,0,0;--global-color-accent--xxx-light:#faf4ff;--global-color-accent--xx-light:#f1ebfd;--global-color-accent--x-light:#e3d7fd;--global-color-accent--light:#a387ed;--global-color-accent--normal:#784fe8;--global-color-accent--dark:#6039cc;--global-color-accent--x-dark:#3d189b;--global-color-accent--xx-dark:#281066;--global-color-accent--xxx-dark:#1e0c4c;--global-color-accent--secondary:var(--global-color-secondary--normal);--global-color-accent--tertiary:var(--global-color-tertiary--normal);--global-color-secondary--xx-light:#fcf6ec;--global-color-secondary--x-light:#e5d7c0;--global-color-secondary--light:#d5b57c;--global-color-secondary--normal:#877453;--global-color-secondary--dark:#514328;--global-color-secondary--x-dark:#332c1f;--global-color-secondary--xxx-dark:var(--global-color-secondary--x-dark);--global-color-tertiary--xx-light:#eafdfb;--global-color-tertiary--x-light:#b8f2eb;--global-color-tertiary--light:#7bd1c8;--global-color-tertiary--normal:#61a39c;--global-color-tertiary--dark:#406d68;--global-color-tertiary--x-dark:#1e3331;--global-color-tertiary--xxx-dark:var(--global-color-tertiary--x-dark);--global-color-info--x-light:var(--global-color-primary--x-light);--global-color-info--light:var(--global-color-primary--light);--global-color-info--normal:var(--global-color-primary--dark);--global-color-info--dark:var(--global-color-primary--x-dark);--global-color-info--x-dark:var(--global-color-primary--xx-dark);--global-color-danger--x-light:#fce4db;--global-color-danger--light:#fcaf91;--global-color-danger--normal:#ed4c11;--global-color-danger--dark:#c23a03;--global-color-danger--x-dark:#932b06;--global-color-warning--x-light:#fdf0d3;--global-color-warning--light:#fed880;--global-color-warning--normal:#f2b327;--global-color-warning--dark:#cd971c;--global-color-warning--x-dark:#996f0a;--global-color-success--x-light:#baf8dc;--global-color-success--light:#93f6cd;--global-color-success--normal:#10f7a9;--global-color-success--dark:#3dce92;--global-color-success--x-dark:#26885f;--global-color-extra--x-light:#f0f6ff;--global-color-extra--light:#b4d0f9;--global-color-extra--normal:#3f85f4;--global-color-extra--dark:#255bb1;--global-color-extra--x-dark:#174a99;--global-color-info--weak:rgba(var(--global-color-info--normal),0.125);--global-color-danger--weak:rgba(var(--global-color-danger--normal),0.125);--global-color-warning--weak:rgba(var(--global-color-warning--normal),0.125);--global-color-success--weak:rgba(var(--global-color-success--normal),0.125);--global-color-extra--weak:rgba(var(--global-color-extra--normal),0.125);--global-color-background--app:var(--global-color-primary--xx-light);--global-color-link-on-light--normal:var(--global-color-accent--normal);--global-color-link-on-dark--normal:var(--global-color-accent--light)}@font-face{font-display:swap;font-family:Benton Sans;font-style:normal;font-weight:400;src:url(fonts/BentonSans-Regular.otf) format("opentype")}@font-face{font-display:swap;font-family:Benton Sans;font-style:italic;font-weight:400;src:url(fonts/BentonSans-RegularItalic.otf) format("opentype")}@font-face{font-display:swap;font-family:Benton Sans;font-style:normal;font-weight:500;src:url(fonts/BentonSans-Medium.otf) format("opentype")}@font-face{font-display:swap;font-family:Benton Sans;font-style:italic;font-weight:500;src:url(fonts/BentonSans-MediumItalic.otf) format("opentype")}@font-face{font-display:swap;font-family:Benton Sans;font-style:normal;font-weight:700;src:url(fonts/BentonSans-Bold.otf) format("opentype")}@font-face{font-display:swap;font-family:Benton Sans;font-style:normal;font-weight:800;src:url(fonts/BentonSans-Black.otf) format("opentype")}:root{--global-font-family--sans--cms:"Benton Sans","Roboto",sans-serif;--global-font-family--sans--portal:"Roboto",sans-serif;--global-font-family--serif:Times,sans-serif;--global-font-family--mono:source-code-pro,Menlo,Monaco,Consolas,"Courier New",monospace;--sans--cms:var(--global-font-family--sans--cms);--sans--portal:var(--global-font-family--sans--portal);--serif:var(--global-font-family--serif);--mono:var(--global-font-family--mono);--global-font-weight--regular:400;--global-font-weight--medium:500;--global-font-weight--bold:700;--global-font-weight--black:800;--regular:var(--global-font-weight--regular);--medium:var(--global-font-weight--medium);--bold:var(--global-font-weight--bold);--black:var(--global-font-weight--black)}:root{--global-max-width--x-narrow:540px;--global-max-width--narrow:720px;--global-max-width--medium:960px;--global-max-width--wide:1140px;--global-max-width--x-wide:1320px;--global-max-width--xx-wide:1580px;--global-max-width--xxx-wide:1800px}:root{--global-space--xx-small:2px;--global-space--x-small:4px;--global-space--small:8px;--global-space--normal:16px;--global-space--large:24px;--global-space--x-large:48px;--global-space--list-indent:40px;--global-space--section-gap:60px;--global-space--grid-gap:30px;--global-space--above-breadcrumbs:45px;--global-space--under-breadcrumbs:40px;--global-space--section-top:12px;--global-space--section-bottom:0;--global-space--section-left:24px;--global-space--section-right:36px;--global-space--section:var(--global-space--section-top) var(--global-space--section-right) var(--global-space--section-bottom) var(--global-space--section-left);--global-space--hr-buffer-above:10px;--global-space--hr-buffer-below:30px;--global-space--p-buffer-above:0;--global-space--p-buffer-below:2rem} -/*! ← core-styles.settings.css */.c-island,.island{background-color:var(--global-color-primary--x-light);border-top:var(--global-border-width--thick) solid var(--global-color-tertiary--normal);font-style:italic;padding:1em 2em}.c-island hr,.island hr{border-bottom:var(--global-border-width--normal) solid;border-top:none;margin-block:2em} +@import url("/static/site_cms/css/build/core-styles.wysiwyg.css"); diff --git a/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.original.css b/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.original.css new file mode 100644 index 000000000..42900acf9 --- /dev/null +++ b/taccsite_cms/static/djangocms_text_ckeditor/ckeditor/contents.original.css @@ -0,0 +1,2 @@ +/*! https://github.com/django-cms/djangocms-text-ckeditor/blob/3.10.0/djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/contents.css */ +body {font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size: 12px;color: #333;background-color: #fff;margin: 20px;}.cke_editable {font-size: 13px;line-height: 1.6;word-wrap: break-word;}blockquote {font-style: italic;font-family: Georgia, Times, "Times New Roman", serif;padding: 2px 0;border-style: solid;border-color: #ccc;border-width: 0;}.cke_contents_ltr blockquote {padding-left: 20px;padding-right: 8px;border-left-width: 5px;}.cke_contents_rtl blockquote {padding-left: 8px;padding-right: 20px;border-right-width: 5px;}a {color: #0782C1;}ol,ul,dl {*margin-right: 0px;padding: 0 40px;}h1,h2,h3,h4,h5,h6 {font-weight: normal;line-height: 1.2;}hr {border: 0px;border-top: 1px solid #ccc;}img.right {border: 1px solid #ccc;float: right;margin-left: 15px;padding: 5px;}img.left {border: 1px solid #ccc;float: left;margin-right: 15px;padding: 5px;}pre {white-space: pre-wrap;word-wrap: break-word;-moz-tab-size: 4;tab-size: 4;}.marker {background-color: Yellow;}span[lang] {font-style: italic;}figure {text-align: center;outline: solid 1px #ccc;background: rgba(0,0,0,0.05);padding: 10px;margin: 10px 20px;display: inline-block;}figure > figcaption {text-align: center;display: block;}a > img {padding: 1px;margin: 1px;border: none;outline: 1px solid #0782C1;}.code-featured {border: 5px solid red;}.math-featured {padding: 20px;box-shadow: 0 0 2px rgba(200, 0, 0, 1);background-color: rgba(255, 0, 0, 0.05);margin: 10px;}.image-clean {border: 0;background: none;padding: 0;}.image-clean > figcaption {font-size: .9em;text-align: right;}.image-grayscale {background-color: white;color: #666;}.image-grayscale img, img.image-grayscale {filter: grayscale(100%);}.embed-240p {max-width: 426px;max-height: 240px;margin:0 auto;}.embed-360p {max-width: 640px;max-height: 360px;margin:0 auto;}.embed-480p {max-width: 854px;max-height: 480px;margin:0 auto;}.embed-720p {max-width: 1280px;max-height: 720px;margin:0 auto;}.embed-1080p {max-width: 1920px;max-height: 1080px;margin:0 auto;} diff --git a/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.wysiwyg.css b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.wysiwyg.css new file mode 100644 index 000000000..350fb8195 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_core-styles/core-styles.wysiwyg.css @@ -0,0 +1,2 @@ +/* TODO: Host Core-Styles static files on a CDN */ +@import url("@tacc/core-styles/dist/core-styles.wysiwyg.css"); From a43fb5cc2ec846204eb64c5f833a8d6ab46817af Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 7 Apr 2023 14:55:36 -0500 Subject: [PATCH 134/137] fix(css): load blog css in correct layer --- taccsite_cms/templates/djangocms_blog/base.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html index 1292a98c2..dff1a32c6 100644 --- a/taccsite_cms/templates/djangocms_blog/base.html +++ b/taccsite_cms/templates/djangocms_blog/base.html @@ -14,7 +14,9 @@ {% endblock meta %} {% block content %} - +
    Date: Mon, 10 Apr 2023 12:34:02 -0500 Subject: [PATCH 136/137] feat(css): figure, caption, etc styles; whole site (#624) --- .../components/django.cms.blog.app.page.css | 30 ------------------- .../elements/figure-caption-blockquote.css | 24 +++++++++++++++ .../static/site_cms/css/src/site.cms.css | 2 ++ 3 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 taccsite_cms/static/site_cms/css/src/_imports/elements/figure-caption-blockquote.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css index df724a8eb..ef39c816f 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.page.css @@ -8,8 +8,6 @@ Reference: Styleguide Components.DjangoCMS.Blog.App.Page */ @import url("@tacc/core-styles/src/lib/_imports/objects/o-offset-content.css"); -@import url("@tacc/core-styles/src/lib/_imports/tools/x-figure.css"); -@import url("@tacc/core-styles/src/lib/_imports/tools/x-blockquote.css"); @import url("./django.cms.blog.app.page.multimedia.css"); @@ -183,31 +181,3 @@ Styleguide Components.DjangoCMS.Blog.App.Page max-width: 50%; } } - - - - - -/* Components & Elements */ - -/* To style elements that are or have captions */ -:--article-page figure, -:--article-page .embed-responsive { - @extend .x-figure; -} -:--article-page figcaption, -:--article-page p.caption { - @extend .x-figure-caption; -} - -:--article-page blockquote { - @extend .x-blockquote; -} -:--article-page blockquote footer { - @extend .x-blockquote-caption; -} - -/* To remove extra whitespace beneath embeded content */ -:--article-page .embed-responsive > * { - display: block; -} diff --git a/taccsite_cms/static/site_cms/css/src/_imports/elements/figure-caption-blockquote.css b/taccsite_cms/static/site_cms/css/src/_imports/elements/figure-caption-blockquote.css new file mode 100644 index 000000000..c5129d166 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_imports/elements/figure-caption-blockquote.css @@ -0,0 +1,24 @@ +@import url("@tacc/core-styles/src/lib/_imports/tools/x-figure.css"); +@import url("@tacc/core-styles/src/lib/_imports/tools/x-blockquote.css"); + +/* To style elements that are or have captions */ +figure, +.embed-responsive { + @extend .x-figure; +} +figcaption, +p.caption { + @extend .x-figure-caption; +} + +blockquote { + @extend .x-blockquote; +} +blockquote footer { + @extend .x-blockquote-caption; +} + +/* To remove extra whitespace beneath embeded content */ +.embed-responsive > * { + display: block; +} diff --git a/taccsite_cms/static/site_cms/css/src/site.cms.css b/taccsite_cms/static/site_cms/css/src/site.cms.css index 5e6a1e64d..c94bab3ed 100644 --- a/taccsite_cms/static/site_cms/css/src/site.cms.css +++ b/taccsite_cms/static/site_cms/css/src/site.cms.css @@ -5,6 +5,8 @@ @import url("./_imports/settings/font.css"); +@import url("./_imports/elements/figure-caption-blockquote.css"); + @import url("./_imports/components/c-button.css"); @import url("./_imports/components/django.cms.css"); @import url("./_imports/components/django.cms.blog.css"); From d5666f46b3ea881c93703b2ba271ae63bda7bab9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 1 May 2023 18:14:52 -0500 Subject: [PATCH 137/137] fix: django 3.0 staticfiles deprecated, use static As is done in https://github.com/TACC/Core-CMS/pull/626. --- taccsite_cms/templates/assets_core.html | 2 +- taccsite_cms/templates/assets_core_cms.html | 2 +- taccsite_cms/templates/assets_core_delayed.html | 2 +- taccsite_cms/templates/assets_custom.html | 2 +- taccsite_cms/templates/assets_font.html | 2 +- taccsite_cms/templates/assets_site.html | 2 +- taccsite_cms/templates/base.html | 2 +- taccsite_cms/templates/debug_js.html | 2 +- taccsite_cms/templates/guide.html | 2 +- taccsite_cms/templates/guides/getting_started.tam.html | 2 +- taccsite_cms/templates/guides/getting_started.v2.html | 2 +- taccsite_cms/templates/header_branding.html | 2 +- taccsite_cms/templates/header_logo.html | 2 +- taccsite_cms/templates/home_portal.html | 2 +- taccsite_cms/templates/nav_search.raw.html | 2 +- taccsite_cms/templates/snippets/typography-guide.html | 2 +- taccsite_cms/templates/style_guide.html | 2 +- taccsite_custom | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/taccsite_cms/templates/assets_core.html b/taccsite_cms/templates/assets_core.html index 3556758c5..0546517c4 100644 --- a/taccsite_cms/templates/assets_core.html +++ b/taccsite_cms/templates/assets_core.html @@ -1,5 +1,5 @@ {# SEE: ./assets_core.md #} -{% load staticfiles %} +{% load static %}