From 2580f35fee69b21a9c9350cf2fd8d70a42784fba Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 15:49:05 -0600 Subject: [PATCH 1/8] chore: search dropdown should use var for white --- .../tup_cms/css/for-core-cms/trumps/search-elements.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css index c8e47c248..7c33542e2 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css @@ -35,7 +35,7 @@ } & .gsc-selected-option-container { - background: #fff; + background: var(--global-color-primary--xx-light); border: var(--global-border--normal); } @@ -134,4 +134,4 @@ vertical-align: unset; top: 1px; } -} \ No newline at end of file +} From b60cd23f1525a56b620e608c722b06cc7d428ac2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 16:37:47 -0600 Subject: [PATCH 2/8] fix: footer buttons should not have width limit --- .../tup_cms/css/for-tup-cms/components/c-footer.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 756e23b1b..b71f827c7 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -11,6 +11,18 @@ svg { +/* BUTTONS */ + +/* To style buttons differently than in body */ +.c-footer .c-button, +.c-footer [class*="button--"] { + --max-width: auto; /* override core-styles.base.css */ +} + + + + + /* LOGOS */ /* To set baseline styles for footer logos */ From 21ecddd47a5fa3f760c4078923143be6da9f7a8f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 16:38:12 -0600 Subject: [PATCH 3/8] refactor: deprecate `` in footer buttons --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index b71f827c7..74e18b09c 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -17,6 +17,12 @@ svg { .c-footer .c-button, .c-footer [class*="button--"] { --max-width: auto; /* override core-styles.base.css */ + font-size: 80%; /* mimic Botstrap .small and */ + + /* TODO: (1) Remove from footer buttons (2) Remove this font-size */ + & small { + font-size: inherit; /* gracefully deprecate use of */ + } } From bb39b52d528f34aaae99c1e6415e008c9a84282c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 16:41:18 -0600 Subject: [PATCH 4/8] fix!: do not let search styles bleed beyond search Requires an `id="tacc-google-search` wrapper. --- .../static/tup_cms/css/for-core-cms/trumps/search-elements.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css index 7c33542e2..4829ff70f 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css @@ -1,4 +1,4 @@ -#cms-content { +#tacc-google-search { /* Whole Search Container */ /* removes padding from search container */ & .gsc-control-cse { From 275ecdd801e19e4759e792832a1e8da21c790c48 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 16:42:40 -0600 Subject: [PATCH 5/8] fix: remove unnecessary style The only `

` on the page is "Search" text provided by CMS not Google. --- .../tup_cms/css/for-core-cms/trumps/search-elements.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css index 4829ff70f..c8cd4aa76 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css @@ -5,11 +5,6 @@ padding: unset; } - /* make header same as news */ - & h1 { - color: var(--global-color-primary--x-dark); - } - From a1d5e14b401672f80d255c23f66d763f8811623d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 16:48:09 -0600 Subject: [PATCH 6/8] docs: explain strange, complex search css selector --- .../static/tup_cms/css/for-core-cms/trumps/search-elements.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css index c8cd4aa76..8e0da5782 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css @@ -22,7 +22,8 @@ border-bottom: unset; } - & tbody>tr:first-child>:is(td, th) { + /* To override Core-Styles tables */ + & tbody > tr:first-child > :is(td, th) { border: unset; padding-inline: unset; background: unset; From 873ac4ff4a1101e1aa3f4d405efbd9c21dbe4262 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 17:54:49 -0600 Subject: [PATCH 7/8] fix: core-styles v2.22.0 to v2.22.1 --- apps/tup-cms/Dockerfile | 4 ++-- package-lock.json | 10 +++++----- package.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index a5bdb4931..ce372dc56 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#678 (core-styles v2.11 to v2.22; migrate css to core-cms|styles) -FROM taccwma/core-cms:d7b7407 +# TACC/Core-CMS#753 (core-styles v2.11 to v2.22; migrate css to core-cms|styles) +FROM taccwma/core-cms:fcb82f2 WORKDIR /code diff --git a/package-lock.json b/package-lock.json index bb0361148..0b8b052b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#a06f5af", + "@tacc/core-styles": "github:TACC/Core-Styles#9ac94d3d", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,8 +5502,8 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.22.0", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#a06f5afb12b027dd71470d5ab50c198c9b403697", + "version": "2.22.1", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9ac94d3d547e870b8a6eb675a3f73f787c5f19a4", "dev": true, "license": "MIT", "bin": { @@ -25541,9 +25541,9 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#a06f5afb12b027dd71470d5ab50c198c9b403697", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9ac94d3d547e870b8a6eb675a3f73f787c5f19a4", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#a06f5af", + "from": "@tacc/core-styles@github:TACC/Core-Styles#9ac94d3d", "requires": {} }, "@tanstack/query-core": { diff --git a/package.json b/package.json index 403ebacd7..edf891c83 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#a06f5af", + "@tacc/core-styles": "github:TACC/Core-Styles#9ac94d3d", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", From bba8603f138163ee03ba364589d6f0e5f8cceb06 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 27 Nov 2023 18:06:31 -0600 Subject: [PATCH 8/8] chore: core-styles v2.22.1 to v2.22.2 --- 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 0b8b052b5..1622f806e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#9ac94d3d", + "@tacc/core-styles": "^2.22.2", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -5502,10 +5502,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "2.22.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9ac94d3d547e870b8a6eb675a3f73f787c5f19a4", + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.22.2.tgz", + "integrity": "sha512-r2QTrZOcUZIjSIcOLktluGhPzGxvYNTEOKF7h6gYmQn8tgiFcesw4xzoIDCVynA5WpaPMZ2jkV3wM+M7SoBd9Q==", "dev": true, - "license": "MIT", "bin": { "core-styles": "src/cli.js" }, @@ -25541,9 +25541,10 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9ac94d3d547e870b8a6eb675a3f73f787c5f19a4", + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.22.2.tgz", + "integrity": "sha512-r2QTrZOcUZIjSIcOLktluGhPzGxvYNTEOKF7h6gYmQn8tgiFcesw4xzoIDCVynA5WpaPMZ2jkV3wM+M7SoBd9Q==", "dev": true, - "from": "@tacc/core-styles@github:TACC/Core-Styles#9ac94d3d", "requires": {} }, "@tanstack/query-core": { diff --git a/package.json b/package.json index edf891c83..cebb32d2f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@nx/vite": "16.5.3", "@nx/web": "16.5.3", "@nx/workspace": "16.5.3", - "@tacc/core-styles": "github:TACC/Core-Styles#9ac94d3d", + "@tacc/core-styles": "^2.22.2", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3",