From bc60470221c2b633e5b393f2f5e7c29e6747180d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 15 Sep 2023 13:17:40 -0500 Subject: [PATCH 1/3] fix: tup-589, font size increase should only be for portal (#321) --- .../for-core-styles/settings/font--portal.css | 17 ----------------- .../tup_cms/css/tup-cms.for-core-styles.css | 2 +- apps/tup-ui/src/main.global.for-core-styles.css | 12 ++++++++++++ 3 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/settings/font--portal.css diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/settings/font--portal.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/settings/font--portal.css deleted file mode 100644 index b7b6871d5..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/settings/font--portal.css +++ /dev/null @@ -1,17 +0,0 @@ -/* Mimic Core-Styles settings/font--docs.css */ -/* FAQ: Design wants to increase base font from 12px to 14px */ -/* FAQ: This change ALMOST gives clients consistent font size variables */ -/* NOTE: - - tup-ui uses `--global-font-size--small` (is now 1.4rem) - - tup-cms uses `--global-font-size--medium` (has been 1.4rem) - - tacc-docs uses `--global-font-size--medium` (has been 1.6rem) -*/ -:root { - --global-font-size--x-small: 1.2rem; - --global-font-size--small: 1.4rem; - --global-font-size--medium: 1.6rem; - --global-font-size--large: 1.8rem; - --global-font-size--x-large: 2.1rem; - --global-font-size--xx-large: 2.8rem; - --global-font-size--xxx-large: 3.2rem; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index e6f8ce97c..8bfc4d0d6 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -2,7 +2,7 @@ /* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */ /* SETTINGS */ -@import url("./for-core-styles/settings/font--portal.css") layer(base); +/* … */ /* GENERICS */ @import url("./for-core-styles/generics/attributes.css") layer(base); diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css index 7b80b3251..f7a712cda 100644 --- a/apps/tup-ui/src/main.global.for-core-styles.css +++ b/apps/tup-ui/src/main.global.for-core-styles.css @@ -18,6 +18,18 @@ hr { --global-space--section-right: 15px; } +/* TODO: Remove this after: + 0. update in TACC/Core-Styles:/…/settings/font--portal.css instead */ +#page-portal main /* i.e. global-safe :root */ { + --global-font-size--x-small: 1.2rem; + --global-font-size--small: 1.4rem; + --global-font-size--medium: 1.6rem; + --global-font-size--large: 1.8rem; + --global-font-size--x-large: 2.1rem; + --global-font-size--xx-large: 2.8rem; + --global-font-size--xxx-large: 3.2rem; +} + /* TODO: Remove this after: 0. confirming this size with lead designer 1. adding these to core-styles.base */ From f1829df4b36dfe3584ef0717bf5704a4ddf0385e Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 15 Sep 2023 13:19:03 -0500 Subject: [PATCH 2/3] chore: limit portal root vars to portal (#322) --- apps/tup-ui/src/main.global.css | 2 +- apps/tup-ui/src/main.global.for-core-styles.css | 4 ++-- apps/tup-ui/src/styles/README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css index 920048111..52124877e 100644 --- a/apps/tup-ui/src/main.global.css +++ b/apps/tup-ui/src/main.global.css @@ -13,7 +13,7 @@ @import url("@tacc/core-styles/dist/trumps/s-form.css"); /* To overwrite @tacc/core-styles CEPv2 spacing */ -:root { +#page-portal main /* i.e. global-safe :root */ { /* TACC/Core-Styles/blob/823b7b9/src/lib/_imports/settings/space.css */ --global-space--section-top: 15px; --global-space--section-bottom: 30px; diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css index f7a712cda..f54d0de31 100644 --- a/apps/tup-ui/src/main.global.for-core-styles.css +++ b/apps/tup-ui/src/main.global.for-core-styles.css @@ -12,7 +12,7 @@ hr { 0. confirming this new spacing with lead designer 1. and updating these in core-styles.base 2. (and maybe) moving those fixed styles to core-styles.portal */ -:root { +#page-portal main /* i.e. global-safe :root */ { --global-space--section-top: 15px; --global-space--section-left: 20px; --global-space--section-right: 15px; @@ -56,7 +56,7 @@ hr { /* TODO: Remove this after: 0. CEP v2 colors are removed from Core-Styles settings/color--portal */ -:root { +#page-portal main /* i.e. global-safe :root */ { /* FAQ: The `!important` is only necessary for dev (and thus prod) server */ --global-color-danger--normal: #dc393b !important; } diff --git a/apps/tup-ui/src/styles/README.md b/apps/tup-ui/src/styles/README.md index 3f8f28380..8f6491f94 100644 --- a/apps/tup-ui/src/styles/README.md +++ b/apps/tup-ui/src/styles/README.md @@ -133,7 +133,7 @@ For new patterns not mature enough for [Core Styles], create it for one project. **`/libs/*/styles/(.../)some-project-stylesheet.css`** ```css -:root { +#page-portal main /* i.e. global-safe :root */ { /* To overwrite @tacc/core-styles/.../settings/color.css */ --some-project-prop: 'value'; } @@ -174,7 +174,7 @@ If you need global styles, then evaluate these options. **`/apps/tup-ui/styles/(.../)some-global-stylesheet.css`** ```css -:root { +#page-portal main /* i.e. global-safe :root */ { /* To overwrite @tacc/core-styles/.../settings/color.css */ --some-global-prop: 'value'; } From e033f466563c2fcee2e5b96173e1d723f81d3c71 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:38:19 -0500 Subject: [PATCH 3/3] docs: fix typos in esoteric readme (#323) --- apps/tup-cms/src/apps/user_news/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/apps/user_news/readme.md b/apps/tup-cms/src/apps/user_news/readme.md index 2ae8cbe66..915f57018 100644 --- a/apps/tup-cms/src/apps/user_news/readme.md +++ b/apps/tup-cms/src/apps/user_news/readme.md @@ -1,3 +1,3 @@ # User Updates -This is a short-term app to list User Updates from an API. The API in use is a proxy of an API that may change. In fact, this app could be replaced by a different app. The future is uncertain. But, this app uses TACC Core-Styles `c-news` UI pattern, so a new app can use the same classnews in its makrup to retain the styles of this app. Alternatively, if the markup is not under our immediate control, we can use Core-Styles to create styles for the new app's markup, and those styles would `@extend` `c-news` classes. +This is a short-term app to list User Updates from an API. The API in use is a proxy of an API that may change. In fact, this app could be replaced by a different app. The future is uncertain. But, this app uses TACC Core-Styles `c-news` UI pattern, so a new app can use the same class in its markup to mirror the styles of this app. Alternatively, if the markup is not under our immediate control, we can use Core-Styles to create styles for the new app's markup, and those styles would `@extend` `c-news` classes.