From 605ecac0c05866091256cb451d016511452aba86 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez Date: Thu, 12 Oct 2023 12:49:03 -0500 Subject: [PATCH 1/3] feat: tup-624: added generics/attributes to demo --- .../css/for-core-styles/generics/attributes.css | 11 +---------- apps/tup-ui/src/main.global.for-core-styles.css | 10 ---------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css index 5fc9012e1..512ca5ade 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css @@ -1,13 +1,4 @@ -/* To render data-prefix value as prefixed text */ -[data-prefix]::before { - display: inline-block; - content: attr(data-prefix); - margin-right: 0.25ch; - - text-transform: none; -} - /* TODO: Remove from c-button in Core-Styles */ [disabled] { pointer-events: none; -} +} \ No newline at end of file diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css index f54d0de31..f173dc2e2 100644 --- a/apps/tup-ui/src/main.global.for-core-styles.css +++ b/apps/tup-ui/src/main.global.for-core-styles.css @@ -44,16 +44,6 @@ hr { height: 16px; } -/* TODO: Remove this after: - 0. attributes.css is migrated to Core-Styles - 1. attributes.css is loaded by Portal */ -[data-prefix]::before { - display: inline-block; - content: attr(data-prefix); - margin-right: 0.25ch; - text-transform: none; -} - /* TODO: Remove this after: 0. CEP v2 colors are removed from Core-Styles settings/color--portal */ #page-portal main /* i.e. global-safe :root */ { From aa077cefe4333e924afbd9eeca7a7da3b0a45cd0 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez Date: Thu, 12 Oct 2023 17:21:13 -0500 Subject: [PATCH 2/3] migrated rest of attributes.css to core-styles --- .../tup_cms/css/for-core-styles/generics/attributes.css | 4 ---- .../tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css deleted file mode 100644 index 512ca5ade..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css +++ /dev/null @@ -1,4 +0,0 @@ -/* TODO: Remove from c-button in Core-Styles */ -[disabled] { - pointer-events: none; -} \ No newline at end of file diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 8bfc4d0d6..306b7be08 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -5,7 +5,7 @@ /* … */ /* GENERICS */ -@import url("./for-core-styles/generics/attributes.css") layer(base); +/* … */ /* ELEMENTS */ /* … */ From 0ce028fdc02882eb7f0af2876b0ae0e1d985a9c8 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez Date: Mon, 16 Oct 2023 11:25:27 -0500 Subject: [PATCH 3/3] removed unnecessary comments in css file for c-button --- .../css/for-core-styles/components/c-button.css | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css index 5b7a119b5..916af26ce 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css @@ -8,12 +8,4 @@ main > .container .c-button--is-active { /* FAQ: Design shows 10px font */ font-size: var(--global-font-size--x-small); -} - -/* TODO: Remove from c-button (once it becomes redundant there) */ -/* FAQ: This is now added in generics/attributes.css */ -/* -[disabled] { - pointer-events: none; -} -*/ +} \ No newline at end of file