diff --git a/taccsite_cms/static/README.md b/taccsite_cms/static/README.md index f2e624401..7b7d80348 100644 --- a/taccsite_cms/static/README.md +++ b/taccsite_cms/static/README.md @@ -1,7 +1,6 @@ # TACC CMS - Static Files -All static files _specific to_ the Core CMS __must__ be placed here _within_ `site_cms`. -All static files _shared with_ the Core CMS __must__ be placed here _within_ `site_shared`. +All static files __must__ be placed here _within_ `site_cms`. These assets will be served by Django and may be built by Node. @@ -9,6 +8,6 @@ See project `README.md` at ["Static Files"](/README.md#static-files). ## Clarification -The `taccsite_cms` directory isolates all Core resources, while the `site_cms` and `site_shared` directories [namespaces the static files and templates][djangocms-custom-resources]. +The `taccsite_cms` directory isolates all Core resources. The `site_cms` directory [namespaces the static files and templates][djangocms-custom-resources]. [djangocms-custom-resources]: https://docs.djangoproject.com/en/2.2/intro/tutorial06/#customize-your-app-s-look-and-feel diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.container.css b/taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.container.css index de6208c04..97a3a3bcb 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.container.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.container.css @@ -7,7 +7,7 @@ Add to Bootstrap styles. See: Styleguide Components.Bootstrap.Grid */ -@import url("../../../../../../../taccsite_cms/static/site_shared/css/src/_imports/tools/media-queries.css"); +@import url("_imports/tools/media-queries.css"); @media (--x-wide-and-above) { .container { max-width: var(--global-max-width--x-wide); } diff --git a/taccsite_cms/static/site_shared/css/src/_imports/components/bootstrap.form.css b/taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.form.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/components/bootstrap.form.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/bootstrap.form.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/components/c-button.css b/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/components/c-button.css rename to taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css diff --git a/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css b/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css index cd28ba708..f96cf61af 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/objects/o-section.css @@ -7,8 +7,8 @@ Markup: o-section.html Styleguide Objects.Section */ -@import url("../../../../../../../taccsite_cms/static/site_shared/css/src/_imports/tools/media-queries.css"); -@import url("../../../../../../../taccsite_cms/static/site_cms/css/src/_imports/tools/x-layout.css"); +@import url("_imports/tools/media-queries.css"); +@import url("_imports/tools/x-layout.css"); diff --git a/taccsite_cms/static/site_shared/css/src/_imports/settings/border.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/border.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/settings/border.css rename to taccsite_cms/static/site_cms/css/src/_imports/settings/border.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/settings/color.css b/taccsite_cms/static/site_cms/css/src/_imports/settings/color.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/settings/color.css rename to taccsite_cms/static/site_cms/css/src/_imports/settings/color.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/tools/media-queries.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/media-queries.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/tools/media-queries.css rename to taccsite_cms/static/site_cms/css/src/_imports/tools/media-queries.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/tools/x-center.css b/taccsite_cms/static/site_cms/css/src/_imports/tools/x-center.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/tools/x-center.css rename to taccsite_cms/static/site_cms/css/src/_imports/tools/x-center.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/trumps/icon.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/icon.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/trumps/icon.css rename to taccsite_cms/static/site_cms/css/src/_imports/trumps/icon.css diff --git a/taccsite_cms/static/site_shared/css/src/_imports/trumps/icon.fonts.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/icon.fonts.css similarity index 100% rename from taccsite_cms/static/site_shared/css/src/_imports/trumps/icon.fonts.css rename to taccsite_cms/static/site_cms/css/src/_imports/trumps/icon.fonts.css diff --git a/taccsite_cms/static/site_cms/css/src/freeze_variables/site.tacc-search-bar.css b/taccsite_cms/static/site_cms/css/src/freeze_variables/site.tacc-search-bar.css index eb2dd850f..b174cfa50 100644 --- a/taccsite_cms/static/site_cms/css/src/freeze_variables/site.tacc-search-bar.css +++ b/taccsite_cms/static/site_cms/css/src/freeze_variables/site.tacc-search-bar.css @@ -7,8 +7,9 @@ /* FAQ: Styles within a custom element can not access the `:root` */ /* SETTINGS */ -@import url("../../../../site_shared/css/src/_imports/settings/color.css"); -@import url("../../../../site_shared/css/src/_imports/settings/border.css"); +/* Shared with Portal */ +@import url("_imports/settings/color.css"); +@import url("_imports/settings/border.css"); [part="button"] { --global-color-primary--x-dark: var(--global-color-primary--x-dark); diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 0e54cad30..d63d8c511 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -5,8 +5,8 @@ /* SETTINGS */ /* Shared with Portal */ -@import url("../../../site_shared/css/src/_imports/settings/border.css"); -@import url("../../../site_shared/css/src/_imports/settings/color.css"); +@import url("_imports/settings/border.css"); +@import url("_imports/settings/color.css"); /* Unique to CMS */ @import url("_imports/settings/props.max-width.css"); @import url("_imports/settings/props.space.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 865a20fd3..a04815a29 100644 --- a/taccsite_cms/static/site_cms/css/src/site.header.css +++ b/taccsite_cms/static/site_cms/css/src/site.header.css @@ -12,20 +12,22 @@ @import url("_imports/settings/font.css"); /* NOTE: Portal does not need this, because it has independent copy of these, but the User Guides do not. This can be removed in Core-CMS PR #192 */ -@import url("../../../site_shared/css/src/_imports/settings/color.css"); +@import url("_imports/settings/color.css"); /* TRUMPS */ +/* Shared with Portal */ /* 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("../../../site_shared/css/src/_imports/trumps/icon.fonts.css"); +@import url("_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 */ +/* Unique to CMS */ @import url("_imports/trumps/s-header.css"); @import url("_imports/trumps/s-portal-nav.css"); @import url("_imports/trumps/s-cms-nav.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 2ed43e670..60c7d09a7 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 @@ -7,16 +7,19 @@ /* SETTINGS */ -@import url("../../../site_shared/css/src/_imports/settings/border.css"); -@import url("../../../site_shared/css/src/_imports/settings/color.css"); +/* Shared with Portal */ +@import url("_imports/settings/border.css"); +@import url("_imports/settings/color.css"); /* COMPONENTS */ -@import url("../../../site_shared/css/src/_imports/components/bootstrap.form.css"); -@import url("../../../site_shared/css/src/_imports/components/c-button.css"); +/* Shared with Portal */ +@import url("_imports/components/bootstrap.form.css"); +@import url("_imports/components/c-button.css"); /* TRUMPS */ -@import url("../../../site_shared/css/src/_imports/trumps/icon.css"); - +/* Shared with Portal */ +@import url("_imports/trumps/icon.css"); +/* Unique to CMS */ @import url("_imports/elements/tacc-search-bar.css"); diff --git a/taccsite_cms/static/site_cms/fonts/README.md b/taccsite_cms/static/site_cms/fonts/README.md deleted file mode 100755 index 10e789ca6..000000000 --- a/taccsite_cms/static/site_cms/fonts/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# TACC CMS - Fonts - -This directory is a shared asset, but it is not in `site_shared`, because the path to load it `../../fonts/` is in a shared file which __must not__ be edited. - -See [`Cortal-Icons-1.2.md`](./Cortal-Icons-1.2.md). - -## To Do - -- [ ] Move this directory to `../site_shared` when paths can be configured on CMS and Portal (maybe via alias-based paths) diff --git a/taccsite_cms/static/site_shared/README.md b/taccsite_cms/static/site_shared/README.md deleted file mode 100644 index 2362e67a2..000000000 --- a/taccsite_cms/static/site_shared/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# TACC CMS - Shared Static Files - -SYNC SOURCE FILES HERE WITH CMS & PORTAL & DOCS! - -The directory structure __must__ mirror that of [`../site_cms`](`../site_cms`). - -## To Do - -- [ ] Create a GitHUb repo that shares source files between Portal, CMS, and User Guide. - -## Documentation Format - -``` -/* WARNING: This file is copied from Portal repo */ -/* TODO: Share source code between CMS, Portal, & User Guide */ -/* SEE: https://github.com/TACC/Frontera-Portal/blob/master/… */ - -/* … */ -``` diff --git a/taccsite_custom b/taccsite_custom index 3aea6db13..f666c0a65 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 3aea6db133cf250cba3b11522c362503d09181b2 +Subproject commit f666c0a6573cbe5822ae50839747422645c74143