Skip to content

Commit

Permalink
Merge branch 'feat/tup-463' into feat/TUP-463-c-button-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Oct 16, 2023
2 parents b3d1371 + 65d0e0d commit 3fc7d9e
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 55 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Media & Content - Alignment */
/* TODO: Share relevant styles with c-news and c-feed-list */



Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/* Highlight */
/* TODO: Create an .x-highlight used to extend a <mark> and a .u-highlight */

/* TODO: Consider whether <mark> should be in Core-Styles…
Perhaps the client should decide what tag to use. */
/* SEE: https://tacc-team.slack.com/archives/CQUA4D5KJ/p1696285622741979 */
mark,
.x-highlight,
:is(.u-highlight, .highlight) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* … */

/* GENERICS */
@import url("./for-core-styles/generics/attributes.css") layer(base);
/* … */

/* ELEMENTS */
/* … */
Expand All @@ -18,11 +18,9 @@
@import url("./for-core-styles/components/c-button.css") layer(base);
@import url("./for-core-styles/components/c-card.css") layer(base);
@import url("./for-core-styles/components/c-card--frontera-about-page.css") layer(base);
@import url("./for-core-styles/components/c-content-block.css") layer(base);
@import url("./for-core-styles/components/c-feed-list.css") layer(base);
@import url("./for-core-styles/components/c-news.css") layer(base);
@import url("./for-core-styles/components/c-pill.css") layer(base);
@import url("./for-core-styles/components/c-update.css") layer(base);

/* TRUMPS */
@import url("./for-core-styles/trumps/u-highlight.css") layer(base);
Expand Down
10 changes: 0 additions & 10 deletions apps/tup-ui/src/main.global.for-core-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ hr {
height: 16px;
}

/* TODO: Remove this after:
0. attributes.css is migrated to Core-Styles
1. attributes.css is loaded by Portal */
[data-prefix]::before {
display: inline-block;
content: attr(data-prefix);
margin-right: 0.25ch;
text-transform: none;
}

/* TODO: Remove this after:
0. CEP v2 colors are removed from Core-Styles settings/color--portal */
#page-portal main /* i.e. global-safe :root */ {
Expand Down

0 comments on commit 3fc7d9e

Please sign in to comment.