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

Quick: Deprecate site_shared #218

Merged
merged 1 commit into from
May 10, 2021
Merged
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
5 changes: 2 additions & 3 deletions taccsite_cms/static/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# 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.

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
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions taccsite_cms/static/site_cms/css/src/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 4 additions & 2 deletions taccsite_cms/static/site_cms/css/src/site.header.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 <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("../../../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");
Expand Down
15 changes: 9 additions & 6 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 @@ -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");
9 changes: 0 additions & 9 deletions taccsite_cms/static/site_cms/fonts/README.md

This file was deleted.

19 changes: 0 additions & 19 deletions taccsite_cms/static/site_shared/README.md

This file was deleted.