Merge branch 'main' into feat/allow-custom-button-for-ticketcreatemodal

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.

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);

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;

apps/tup-ui/src/main.global.for-core-styles.css

@@ -12,12 +12,24 @@ 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;
 }
 
+/* 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 */
@@ -44,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;
 }

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';
 }