From aa8c5ea368504ecbefe9eaede1ff91b6d1ded228 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 20 Jul 2022 18:41:59 -0500 Subject: [PATCH 1/2] fix(core-styles): css import paths --- .../static/site_cms/css/.postcssrc.yml | 4 +- .../components/django.cms.blog.app.item.css | 2 +- .../static/site_cms/css/src/app.blog.css | 2 +- .../css/src/app.taccsite_system_specs.css | 2 +- taccsite_cms/static/site_cms/css/src/site.css | 43 +++++++++---------- .../static/site_cms/css/src/site.header.css | 10 ++--- .../site_cms/css/src/site.header.docs.css | 2 +- .../site_cms/css/src/site.tacc-search-bar.css | 8 ++-- .../site_cms/css/src/template.guide.css | 8 ++-- .../site_cms/css/src/template.home_portal.css | 2 +- .../site_cms/css/src/template.style-guide.css | 2 +- taccsite_custom | 2 +- 12 files changed, 42 insertions(+), 45 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/.postcssrc.yml b/taccsite_cms/static/site_cms/css/.postcssrc.yml index 02fa718dd..02fded597 100644 --- a/taccsite_cms/static/site_cms/css/.postcssrc.yml +++ b/taccsite_cms/static/site_cms/css/.postcssrc.yml @@ -4,9 +4,9 @@ plugins: postcss-import: # In any source file, every @import path, not prepended with "./" nor "../", # is relative to only one of these directories in this order. + # HACK: This is ONLY for `@import url("_migrations/v1_v2.css");` path: - 'taccsite_cms/static/site_cms/css/src' # Core-CMS CSS source files - - 'node_modules/@tacc/core-styles/src/lib' # Core-Styles CSS source files postcss-env-function: importFrom: - - 'node_modules/@tacc/core-styles/src/lib/_themes/default.json' + - '@tacc/core-styles/src/lib/_themes/default.json' 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 995ce3dfd..172580d7e 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 @@ -10,7 +10,7 @@ Styleguide Components.DjangoCMS.Blog.App.Item @import url("@tacc/core-styles/src/lib/_imports/tools/x-article-link.css"); @import url("@tacc/core-styles/src/lib/_imports/tools/x-truncate.css"); -@import url("_imports/tools/selectors.css"); +@import url("../tools/selectors.css"); diff --git a/taccsite_cms/static/site_cms/css/src/app.blog.css b/taccsite_cms/static/site_cms/css/src/app.blog.css index ff63c5547..0a284416b 100644 --- a/taccsite_cms/static/site_cms/css/src/app.blog.css +++ b/taccsite_cms/static/site_cms/css/src/app.blog.css @@ -2,4 +2,4 @@ /* Styles for blog app pages (not blog plugins which can be anywhere on site) */ /* FAQ: For blog plugin styles, see `./django.cms.blog.plugins.css` */ -@import url("_imports/components/django.cms.blog.app.css"); +@import url("./_imports/components/django.cms.blog.app.css"); diff --git a/taccsite_cms/static/site_cms/css/src/app.taccsite_system_specs.css b/taccsite_cms/static/site_cms/css/src/app.taccsite_system_specs.css index 330df832e..98b30e20f 100644 --- a/taccsite_cms/static/site_cms/css/src/app.taccsite_system_specs.css +++ b/taccsite_cms/static/site_cms/css/src/app.taccsite_system_specs.css @@ -4,4 +4,4 @@ /* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */ /* TRUMPS */ -@import url("_imports/trumps/s-system-specs.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-system-specs.css"); diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 5bca6fd9b..a7cf86ca3 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -4,9 +4,8 @@ /* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */ /* SETTINGS */ -@import url("_imports/settings/border.css"); -@import url("_imports/settings/max-width.css"); -/* Unique to CMS */ +@import url("@tacc/core-styles/src/lib/_imports/settings/border.css"); +@import url("@tacc/core-styles/src/lib/_imports/settings/max-width.css"); @import url("./_imports/settings/color.css"); @import url("./_imports/settings/space.css"); @import url("./_imports/settings/font.css"); @@ -17,27 +16,25 @@ /* ELEMENTS */ /* Bootstrap performs much of this */ -@import url("_imports/elements/html-elements.css"); -/* Unique to CMS */ +@import url("@tacc/core-styles/src/lib/_imports/elements/html-elements.css"); @import url("./_imports/elements/form.css"); -/* Load custom element styles within custom element, not here */ +/* NOTE: Load any custom element styles within the custom element, not here */ /* OBJECTS */ -@import url("_imports/objects/o-grid.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-grid.css"); +@import url("@tacc/core-styles/src/lib/_imports/objects/o-offset-content.css"); +@import url("@tacc/core-styles/src/lib/_imports/objects/o-section.css"); /* COMPONENTS */ -@import url("_imports/components/c-card.css"); -@import url("_imports/components/c-callout.css"); -@import url("_imports/components/c-data-list.css"); -@import url("_imports/components/c-nav.css"); -@import url("_imports/components/c-footer.css"); -@import url("_imports/components/c-recognition.css"); -@import url("_imports/components/c-see-all-link.css"); -@import url("_imports/components/bootstrap.container.css"); -@import url("_imports/components/bootstrap.figure.css"); -/* Unique to CMS */ +@import url("@tacc/core-styles/src/lib/_imports/components/c-card.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-callout.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-data-list.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-nav.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-footer.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-recognition.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/c-see-all-link.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/bootstrap.container.css"); +@import url("@tacc/core-styles/src/lib/_imports/components/bootstrap.figure.css"); @import url("./_imports/components/c-button.css"); @import url("./_imports/components/django.cms.css"); @import url("./_imports/components/django.cms.blog.css"); @@ -46,7 +43,7 @@ @import url("./_imports/components/django.cms.picture.css"); /* TRUMPS */ -@import url("_imports/trumps/s-breadcrumbs.css"); -@import url("_imports/trumps/s-footer.css"); -@import url("_imports/trumps/s-blockquote.css"); -@import url("_imports/trumps/u-empty.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-breadcrumbs.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-footer.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-blockquote.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/u-empty.css"); 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..a858bf911 100644 --- a/taccsite_cms/static/site_cms/css/src/site.header.css +++ b/taccsite_cms/static/site_cms/css/src/site.header.css @@ -19,18 +19,18 @@ /* 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/src/lib/_imports/trumps/icon.fonts.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 - the Portal nav - the CMS nav */ -@import url("_imports/trumps/s-header.css"); -@import url("_imports/trumps/s-portal-nav.css"); -@import url("_imports/trumps/s-cms-nav.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-header.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-portal-nav.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-cms-nav.css"); /* UNORGANIZED */ /* TODO: Convert to a component */ -@import url("_imports/branding_logos.css"); +@import url("@tacc/core-styles/src/lib/_imports/branding_logos.css"); diff --git a/taccsite_cms/static/site_cms/css/src/site.header.docs.css b/taccsite_cms/static/site_cms/css/src/site.header.docs.css index d0462afa6..7cc7ede6b 100644 --- a/taccsite_cms/static/site_cms/css/src/site.header.docs.css +++ b/taccsite_cms/static/site_cms/css/src/site.header.docs.css @@ -3,6 +3,6 @@ /* NOTE: This file exists so User Guide can load header styles only it needs */ /* FAQ: User Guide lacks the vars that _imports/trumps/s-header.css expects */ -@import url("_imports/settings/border.css"); +@import url("@tacc/core-styles/src/lib/_imports/settings/border.css"); /* Unique to CMS */ @import url("./_imports/settings/color.css"); 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..4da51d5ab 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,9 +8,9 @@ /* TRUMPS */ /* Shared with Portal */ -@import url("_imports/trumps/icon.css"); -@import url("_imports/trumps/u-hide.css"); -@import url("_imports/trumps/tacc-search-bar.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/icon.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/u-hide.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/tacc-search-bar.css"); /* ELEMENTS */ /* HACK: "ELEMENTS" should be loaded __before__ "TRUMPS" */ @@ -18,4 +18,4 @@ /* Load search bar after all relevant styles have loaded */ /* FAQ: Manage visibility of search bar to avoid FOUC */ /* HACK: GH-101: Resolve via dynamically-added `[data-status="loaded"]` */ -@import url("_imports/elements/tacc-search-bar.css"); +@import url("@tacc/core-styles/src/lib/_imports/elements/tacc-search-bar.css"); diff --git a/taccsite_cms/static/site_cms/css/src/template.guide.css b/taccsite_cms/static/site_cms/css/src/template.guide.css index d18268f12..3af8e78e2 100644 --- a/taccsite_cms/static/site_cms/css/src/template.guide.css +++ b/taccsite_cms/static/site_cms/css/src/template.guide.css @@ -5,7 +5,7 @@ /* TRUMPS */ -@import url("_imports/trumps/s-document.css"); -@import url("_imports/trumps/s-guide-doc.css"); -@import url("_imports/trumps/s-inline-dl.css"); -@import url("_imports/trumps/u-nested-text-content.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-document.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-guide-doc.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-inline-dl.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/u-nested-text-content.css"); diff --git a/taccsite_cms/static/site_cms/css/src/template.home_portal.css b/taccsite_cms/static/site_cms/css/src/template.home_portal.css index a47250719..a44bc2a34 100644 --- a/taccsite_cms/static/site_cms/css/src/template.home_portal.css +++ b/taccsite_cms/static/site_cms/css/src/template.home_portal.css @@ -5,4 +5,4 @@ /* TRUMPS */ -@import url("_imports/trumps/s-document.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-document.css"); diff --git a/taccsite_cms/static/site_cms/css/src/template.style-guide.css b/taccsite_cms/static/site_cms/css/src/template.style-guide.css index cf3876b5b..9df10bc81 100644 --- a/taccsite_cms/static/site_cms/css/src/template.style-guide.css +++ b/taccsite_cms/static/site_cms/css/src/template.style-guide.css @@ -5,4 +5,4 @@ /* TRUMPS */ -@import url("_imports/trumps/s-style-guide.css"); +@import url("@tacc/core-styles/src/lib/_imports/trumps/s-style-guide.css"); diff --git a/taccsite_custom b/taccsite_custom index 64f8f7445..339b98a7c 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 64f8f744505cd16a7bbf756af8cd6589eed19147 +Subproject commit 339b98a7ca43349426efca754b5e25dc1dfc64db From d8a7a0b2990a48ae0004a1b100d0e902ee672fb9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 25 Jul 2022 10:53:05 -0500 Subject: [PATCH 2/2] chore(taccsite_ui): relevant core-styles branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 58f54b428..2b2eee289 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/fp-1499-cms-pattern-library", + "@tacc/core-styles": "github:TACC/Core-Styles#task/fp-1499-cms-pattern-library--general-fix-for-import-paths", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git",