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

Jump to bottom

feat: update Core-CMS & Core-Styles, rename CMS Settings, Portal Purple to Blue #476

Merged
merged 32 commits into from
Oct 17, 2024
Merged

feat: update Core-CMS & Core-Styles, rename CMS Settings, Portal Purple to Blue #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6e6b679
chore: CMD-182 do not use deprecated CSS vars
wesleyboar Aug 23, 2024
4553d6d
enhance: CMD-182 use Core-CMS that has design tokens
wesleyboar Aug 23, 2024
81cb021
deps: CMD-182 core-styles and postcss…
wesleyboar Aug 23, 2024
ab490f2
feat: CMD-182 use tokens core-v3
wesleyboar Aug 23, 2024
291efe4
fix(cep): dev, cms tag via hash
wesleyboar Aug 23, 2024
443b30a
fix: CMD-182 color fix snippet was using core-v2
wesleyboar Aug 23, 2024
75ecadd
feat: CMD-182 use built tokens core-v3
wesleyboar Aug 23, 2024
4330030
fix: CMD-182 cms tag actual design tokens i hope
wesleyboar Aug 23, 2024
ea5002e
refactor: CMD-182 delete unnecessary overrides
wesleyboar Aug 26, 2024
c82a249
fix: CMD-182 cms w/ updated tokens
wesleyboar Aug 26, 2024
8ff037c
fix: CMD-182 cms w/ updated tokens & fixed rgb()
wesleyboar Sep 5, 2024
2090fee
fix: CMD-182 remove outdated css hack
wesleyboar Sep 5, 2024
8b29551
deps: CMD-182 core-styles colors.accent.1.light
wesleyboar Sep 5, 2024
1c26d0d
deps: CMD-182 core-styles v2.32.0 core-cms v4.15.0
wesleyboar Sep 5, 2024
6373e23
fix(tup-cms): missing v in tag
wesleyboar Sep 5, 2024
041d5d4
chore: CMD-182 delete unnecessary snippet
wesleyboar Sep 5, 2024
3d54f51
fix: CMD-182 do not use --weak accent color var
wesleyboar Sep 5, 2024
88c81b2
deps: CMD-182 core-styles v2.32.1 core-cms v4.15.1
wesleyboar Sep 5, 2024
2a60693
deps: CMD-182 core-cms v4.15.2
wesleyboar Sep 5, 2024
56d6001
chore: CMD-182 delete unnecessary snippet override
wesleyboar Sep 5, 2024
65a37c6
refactor: Core-CMS v4.13.0 branding settings
wesleyboar Sep 5, 2024
2c6812b
refactor: cmd-79 rename tacc cms settings (#416)
wesleyboar Sep 5, 2024
3949325
deps: core-cms v4.15.3 candidate
wesleyboar Sep 6, 2024
c437461
deps: core-cms v4.15.3 candidate (update)
wesleyboar Sep 6, 2024
108d41d
deps: core-cms v4.16, core-styles v2.33
wesleyboar Sep 6, 2024
d82ecff
deps: core-styles v2.33.1
wesleyboar Sep 9, 2024
552f38c
chore: core-cms v4.16.1
wesleyboar Sep 9, 2024
83530d6
Merge branch 'main' into enhance/CMD-182-design-tokens
wesleyboar Sep 12, 2024
8a4a385
Merge branch 'main' into enhance/CMD-182-design-tokens
wesleyboar Sep 17, 2024
87664c4
feat: core-cms v4.17.1
wesleyboar Sep 17, 2024
9beb9ac
chore(tup-cms): remove unused templates
wesleyboar Sep 17, 2024
a7983db
Merge branch 'main' into enhance/CMD-182-design-tokens
jarosenb Oct 17, 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: 2 additions & 1 deletion .postcssrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ plugins:
features:
custom-media-queries: true
media-query-ranges: true
custom-selectors: true
nesting-rules: true
custom-selectors: true
relative-color-syntax: true
Comment on lines +11 to +12
Copy link
Member Author

@wesleyboar wesleyboar Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

custom-selectors: moved / no-op
relative-color-syntax: to change a color programmatically

postcss-replace:
# @tacc/core-styles: 'dist/' uses `../../fonts/`
pattern: fonts/
Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY . /code/
RUN npx nx build tup-ui
RUN npx nx build tup-cms-react

FROM taccwma/core-cms:v4.10.2
FROM taccwma/core-cms:v4.17.1

WORKDIR /code

Expand Down
58 changes: 21 additions & 37 deletions apps/tup-cms/src/taccsite_cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@
CMS_TEMPLATES = (
('standard.html', 'Standard'),
('fullwidth.html', 'Full Width'),

('guide.html', 'Guide'),
('guides/getting_started.html', 'Guide: Getting Started'),
('guides/data_transfer.html', 'Guide: Data Transfer'),
('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
('guides/portal_technology.html', 'Guide: Portal Technology Stack'),
)

CMS_PERMISSIONS = True
Expand Down Expand Up @@ -87,35 +81,23 @@
# TACC: BRANDING
########################

# NOTE: Variables NSF_BRANDING, TACC_BRANDING, and UTEXAS_BRANDING are duplicated from Core-CMS cuz current infrastructure lacks ability to reference default values.

UTEXAS_BRANDING = [
"utexas",
"site_cms/img/org_logos/utaustin-white.png",
"branding-utaustin",
"https://www.utexas.edu/",
"_blank",
"University of Texas at Austin Logo",
"anonymous",
"True"
]
from taccsite_cms._settings.branding import *

BRANDING = [ UTEXAS_BRANDING ]
PORTAL_BRANDING = [ PORTAL_BRANDING_UTEXAS ]

########################
# TACC: LOGOS
########################

LOGO = [
"tup",
"tup_cms/img/org_logos/tacc-logo-white.svg",
"tup",
"/",
"_self",
"TACC Logo",
"anonymous",
"True"
]
PORTAL_LOGO = {
"img_file_src": "tup_cms/img/org_logos/tacc-logo-white.svg",
"is_remote": False,
"img_class": "",
"link_href": "/",
"link_target": "_self",
"img_alt_text": "TACC Logo",
"img_crossorigin": "anonymous",
} # To hide logo, set `PORTAL_LOGO = False`

########################
# TACC: SEARCH
Expand All @@ -140,15 +122,17 @@
# TACC: PORTAL
########################

INCLUDES_CORE_PORTAL = False
INCLUDES_PORTAL_NAV = True
INCLUDES_SEARCH_BAR = True
PORTAL_IS_TACC_CORE_PORTAL = False
PORTAL_HAS_LOGIN = True
PORTAL_HAS_SEARCH = True

PORTAL_NAV_WIDTH = 'lg'

########################
# TACC: SOCIAL MEDIA
########################

TACC_SOCIAL_SHARE_PLATFORMS = ['linkedin', 'facebook', 'email']
PORTAL_SOCIAL_SHARE_PLATFORMS = ['linkedin', 'facebook', 'email']

########################
# DJANGOCMS_BLOG
Expand Down Expand Up @@ -200,10 +184,10 @@
# DJANGOCMS_BLOG: TACC
########################

TACC_BLOG_SHOW_CATEGORIES = True
TACC_BLOG_SHOW_TAGS = False
TACC_BLOG_CUSTOM_MEDIA_POST_CATEGORY = 'multimedia'
TACC_BLOG_SHOW_ABSTRACT_TAG = 'external'
PORTAL_BLOG_SHOW_CATEGORIES = True
PORTAL_BLOG_SHOW_TAGS = False
PORTAL_BLOG_CUSTOM_MEDIA_POST_CATEGORY = 'multimedia'
PORTAL_BLOG_SHOW_ABSTRACT_TAG = 'external'

TACC_BLOG_CATEGORY_ORDER = ['press-release', 'feature-story', 'multimedia', 'podcast']

Expand Down
67 changes: 0 additions & 67 deletions apps/tup-cms/src/taccsite_cms/templates/snippets/css-button-color-in-dark-contexts.html
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions apps/tup-cms/src/taccsite_cms/templates/snippets/logos-social-media.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

/* url under search result title */
& .gs-webResult div.gs-visibleUrl {
color: var(--global-color-accent--secondary);
color: var(--global-color-secondary--normal);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

}

/* search result titles */
Expand Down
2 changes: 1 addition & 1 deletion ...src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
/* TODO: Share styles between c-news and c-feed-list (`time:not(…)`) */
.c-feed-list > :is(div, article) > time:not(:is(h1, h2, h3, h4, h5, h6) *),
.c-feed-list > :is(div, article) > p:has(time):not(:is(h1, h2, h3, h4, h5, h6) *) {
color: var(--global-color-accent--secondary);
color: var(--global-color-secondary--normal);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

font-weight: var(--medium);
text-transform: uppercase;
}
Expand Down
2 changes: 1 addition & 1 deletion ...-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-news.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/* TODO: Share styles between c-news and c-feed-list (`time:not(…)`) */
.c-news article time:not(:is(h1, h2, h3, h4, h5, h6) *) {
color: var(--global-color-accent--secondary);
color: var(--global-color-secondary--normal);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

font-weight: var(--medium);
text-transform: uppercase;
}
Expand Down
64 changes: 0 additions & 64 deletions apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/generics/color.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/trumps/s-abbr-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
.s-abbr-list span.abbr,
.abbr-list abbr,
.abbr-list span.abbr {
color: var(--global-color-accent--secondary);
color: var(--global-color-secondary--normal);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

font-weight: var(--bold);
}
2 changes: 1 addition & 1 deletion apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-tup-cms.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* ... */

/* GENERICS */
@import url("./for-tup-cms/generics/color.css") layer(project);
/* ... */

/* ELEMENTS */
@import url("./for-tup-cms/elements/headings--cms.css") layer(project);
Expand Down
2 changes: 1 addition & 1 deletion libs/core-components/src/lib/HistoryBadge/HistoryBadge.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
}

.disabled {
background-color: var(--global-color-accent--weak);
background-color: var(--global-color-accent--xx-light);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

}
2 changes: 1 addition & 1 deletion libs/core-components/src/lib/Sidebar/Sidebar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.link:hover,
.link--active:is(:link, :visited) {
color: var(--global-color-primary--x-dark); /* to pass color contrast test */
background-color: var(--global-color-accent--weak);
background-color: var(--global-color-accent--xx-light);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

}
.link:active,
.link--active:is(:link, :visited) {
Expand Down
4 changes: 2 additions & 2 deletions libs/core-wrappers/src/lib/Navbar/Navbar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
}

.nav-content:hover {
background: var(--global-color-accent--weak);
background: var(--global-color-accent--xx-light);
}

.nav-active {
background: var(--global-color-accent--weak);
background: var(--global-color-accent--xx-light);
}

.nav-text {
Expand Down
2 changes: 1 addition & 1 deletion libs/tup-components/src/news/UserNews.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.posted-date {
color: var(--global-color-accent--secondary);
color: var(--global-color-secondary--normal);
Copy link
Member Author

Choose a reason for hiding this comment

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

Uses Core-Styles v2 color var name instead of v1’s.

font-weight: var(--medium);
text-transform: uppercase;
}
Expand Down
Loading
Loading