From b3d1371608873891f948c8986487f175dc658d27 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 11 Oct 2023 14:40:01 -0500 Subject: [PATCH 1/2] chore: migrate c-button styles to core-cms https://github.com/TACC/Core-CMS/pull/729 --- .../css/for-core-styles/components/c-button.css | 12 ------------ 1 file changed, 12 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..40646d268 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 @@ -1,15 +1,3 @@ -/* TODO: When migrated to Core, remove `main > .container` (i.e. "in CMS") */ -main > .container .c-button--primary, -main > .container .c-button--secondary, -main > .container .c-button--tertiary, -main > .container .c-button--is-active { - /* FAQ: Design looks like 10px 20px, but M.S. requests more */ - padding: 10px 30px; - - /* 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 */ /* From c659bdbecfac27ac90659492cce148c3acdaa034 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 16 Oct 2023 12:19:58 -0500 Subject: [PATCH 2/2] fix: remove import of file deleted in merge --- .../tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css | 1 - 1 file changed, 1 deletion(-) 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 3a222caaa..c92286b57 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 @@ -15,7 +15,6 @@ @import url("./for-core-styles/objects/o-heading-steps.css") layer(base); /* COMPONENTS */ -@import url("./for-core-styles/components/c-button.css") layer(base); @import url("./for-core-styles/components/c-card.css") layer(base); @import url("./for-core-styles/components/c-card--frontera-about-page.css") layer(base); @import url("./for-core-styles/components/c-feed-list.css") layer(base);