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.

Sign up for GitHub

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

feat: core-cms v4.8 & core-styles v2.25 #436

Merged
merged 8 commits into from
Mar 6, 2024
Merged

feat: core-cms v4.8 & core-styles v2.25 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
baf341b
feat(tup-cms): Core-CMS v4.8.2
wesleyboar Mar 1, 2024
fe384a9
feat: @tacc/core-styles v2.24.1 ie Table Redesign
wesleyboar Mar 1, 2024
a1f3e12
feat: @tacc/core-styles v2.25.1 revert Table Redesign
wesleyboar Mar 1, 2024
abb5c88
feat: Core-CMS v4.8 new core-styles + a11y fixes
wesleyboar Mar 2, 2024
721c15f
feat: TACC/Core-CMS#808
wesleyboar Mar 2, 2024
4bb1ac1
feat: TACC/Core-CMS#808 for real this time
wesleyboar Mar 2, 2024
75b4681
feat: TACC/Core-CMS#v4.8.3
wesleyboar Mar 4, 2024
bb4d12f
fix: deprecated FAVICON code (TACC/Core-CMS#783)
wesleyboar Mar 5, 2024
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
3 changes: 1 addition & 2 deletions apps/tup-cms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ COPY . /code/
RUN npx nx build tup-ui
RUN npx nx build tup-cms-react

# TACC/Core-CMS#v4.6.0 (Python 3.11)
FROM taccwma/core-cms:8a56b9d
FROM taccwma/core-cms:v4.8.3

WORKDIR /code

Expand Down
6 changes: 3 additions & 3 deletions apps/tup-cms/src/taccsite_cms/templates/assets_custom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@


{# COPIED FROM CORE #}
{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #}
{# https://github.com/TACC/Core-CMS/blob/v4.8.3/taccsite_cms/templates/assets_custom.html #}

{% load static %}

<!-- Custom Site Assets: Favicon. -->
{% with settings.FAVICON as favicon %}
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
{% with settings.PORTAL_FAVICON as favicon %}
<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
Comment on lines -13 to +14
Copy link
Member Author

@wesleyboar wesleyboar Mar 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To support TACC/CMS#v4.7.0: CDN Logo & Favicon via PORTAL_LOGO / PORTAL_FAVICON.1

Footnotes

  1. Mimics part of the changes in refactor: cmd-79 rename tacc cms settings #416. ↩

{% endwith %}


Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@nx/vite": "17.2.8",
"@nx/web": "17.2.8",
"@nx/workspace": "17.2.8",
"@tacc/core-styles": "^2.23.1",
"@tacc/core-styles": "^2.25.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
Expand Down
Loading