Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task/fp 1499 cms pattern library - fix css import paths #520

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"@frctl/fractal": "^1.5.13",
"@frctl/mandelbrot": "^1.10.1",
"@tacc/core-styles": "^0.8.0-beta",
"@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",
Expand Down
4 changes: 2 additions & 2 deletions taccsite_cms/static/site_cms/css/.postcssrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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");



Expand Down
2 changes: 1 addition & 1 deletion taccsite_cms/static/site_cms/css/src/app.blog.css
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Original file line number Diff line number Diff line change
Expand Up @@ -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");
43 changes: 20 additions & 23 deletions taccsite_cms/static/site_cms/css/src/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
10 changes: 5 additions & 5 deletions taccsite_cms/static/site_cms/css/src/site.header.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
/* FP-526: Consider loading Cortal icons with <link> 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");
2 changes: 1 addition & 1 deletion taccsite_cms/static/site_cms/css/src/site.header.docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -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");
8 changes: 4 additions & 4 deletions taccsite_cms/static/site_cms/css/src/site.tacc-search-bar.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
/* 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" */

/* 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");
8 changes: 4 additions & 4 deletions taccsite_cms/static/site_cms/css/src/template.guide.css
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

/* TRUMPS */

@import url("_imports/trumps/s-document.css");
@import url("@tacc/core-styles/src/lib/_imports/trumps/s-document.css");
Original file line number Diff line number Diff line change
Expand Up @@ -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");