Skip to content

Commit

Permalink
feat(tup-cms): core-cms v3.12.0-alpha (#232)
Browse files Browse the repository at this point in the history
* feat: load default core-styles theme

Without this, the header will be missing colors on Portal.

As of TACC/Core-CMS#634, those colors come from var()'s in a theme.

* feat(tup-cms): core-cms v3.11.0-beta.2

* feat(tup-cms): core-cms pseudo v3.12.0-alpha

* chore(tup-cms): drop TACC/Core-CMS#646 placeholder

This template/solution was only needed until Core-CMS provides it:

TACC/Core-CMS#646

* docs(tup-cms): say core-cms.css not site.cms.css

The name of Core-CMS–specific primary stylesheet changed.

* fix(tup-cms): site.cms.css → tup-cms.css

To mimic Core-CMS's `core-cms.css`.

This name makes it easier to find in Network requests, which may hide the path, which has `/tup_cms/`.

* fix(tup-cms): static url typo

* chore: TACC_CORE_STYLES_VERSION, 1 → 2

The COre-CMS only deals with <1 and >1, but let's be accurate here.

* feat(tup-cms): TACC/Core-CMSv3.12.0-alpha.3

* feat(tup-cms): TACC/Core-CMSv3.12.0-alpha.4
  • Loading branch information
wesleyboar authored Jun 20, 2023
1 parent 19e87bf commit a79af08
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 44 deletions.
4 changes: 2 additions & 2 deletions apps/tup-cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TACC/Core-CMS#631 (which bubbles up to TACC/Core-CMS#581@9ff0f1e)
FROM taccwma/core-cms:4bfdffa
# TACC/Core-CMS#v3.12.0-alpha.4 (via TACC/Core-CMS#581)
FROM taccwma/core-cms:4fe44ca

WORKDIR /code

Expand Down
2 changes: 2 additions & 0 deletions apps/tup-cms/src/apps/portal/templates/portal/assets.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% load static %}

<style>
@import url("{% static 'site_cms/css/build/core-styles.theme.default.css' %}") layer(base);

@import url("{% static 'site_cms/css/build/core-styles.portal.css' %}") layer(base);
@import url("{% static 'site_cms/css/build/core-styles.header.css' %}") layer(base);
</style>
Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/src/taccsite_cms/settings_custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
# TACC: CORE STYLES
########################

TACC_CORE_STYLES_VERSION = 1
TACC_CORE_STYLES_VERSION = 2

########################
# PLUGIN SETTINGS
Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/src/taccsite_cms/templates/assets_custom.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@

<!-- TUP CMS UI Styles -->
<style>
@import url("{% static 'tup_cms/css/site.cms.css' %}");
@import url("{% static 'tup_cms/css/tup-cms.css' %}");
</style>
36 changes: 0 additions & 36 deletions apps/tup-cms/src/taccsite_cms/templates/nav_search.raw.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

[class*="banner-cell--"] figure {
margin-bottom: unset; /* undo site.cms.css and Bootstrap */
margin-bottom: unset; /* undo core-cms.css and Bootstrap */
}

[class*="banner-cell--"] figcaption {
Expand Down Expand Up @@ -179,7 +179,7 @@

/* Conflicts with Core-CMS */

/* Overwrite Core-CMS site.cms.css */
/* Overwrite Core-CMS core-cms.css */
/* HELP: How can all CMS sites avoid this? */
[class*="banner-cell--"] figcaption {
border-bottom: unset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
}
:is(.layered-image, [class*="layered-image--"])
> :is(.align-left, .align-right) {
float: unset; /* undo site.cms.css */
max-width: unset; /* undo site.cms.css */
float: unset; /* undo core-cms.css */
max-width: unset; /* undo core-cms.css */
}

/* To position images at standard anchor points */
Expand Down

0 comments on commit a79af08

Please sign in to comment.