Skip to content

Commit

Permalink
Merge branch 'feat/tup-463' into fix/tup-617-c-button-font-weight
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Nov 3, 2023
2 parents 04b2d01 + fcb4a3e commit 7c060cf
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 156 deletions.

This file was deleted.

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.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,4 @@ main > .container .c-button--is-active {

/* FAQ: Design shows 10px font */
font-size: var(--global-font-size--x-small);
}

/* TODO: Remove from c-button (once it becomes redundant there) */
/* FAQ: This is now added in generics/attributes.css */
/*
[disabled] {
pointer-events: none;
}
*/
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/* FIX CARD */

/* !!!: When migrated:
1. Remove `:where(:not(…` (e.g. "not in portal").
2. Prevent these styles in apps/tup-ui TicketHistory CSS */
:is(.card, .c-card, [class*="card--"]) p:last-child:where(:not(#page-portal *)) {
margin-bottom: 2rem; /* restore <p> `margin-bottom `*/
}

/* FAQ: Used on image cards for staff like on /education/k-12-students/ */
:is(.card, .c-card, [class*="card--"]) h4 {
margin-bottom: 0.375em;
}





/* SUPPORT LIST IN CARD */

/* FAQ: The Portal uses Bootstrap ".card" for ticket modal */
Expand Down

This file was deleted.

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 @@ -15,9 +15,7 @@

/* COMPONENTS */
@import url("./for-core-cms/components/c-footer.css") layer(project);
@import url("./for-core-cms/components/django.cms.blog.app.item.css") layer(project);
@import url("./for-core-cms/components/django.cms.blog.app.page.css") layer(project);
@import url("./for-core-cms/components/django.cms.picture.css") layer(project);
@import url("./for-core-cms/components/lightgallery.css") layer(project);

/* TRUMPS */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
/* … */

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

/* ELEMENTS */
/* … */

/* OBJECTS */
@import url("./for-core-styles/objects/o-section.css") layer(base);
@import url("./for-core-styles/objects/o-heading-steps.css") layer(base);

/* COMPONENTS */
@import url("./for-core-styles/components/c-button.css") layer(base);
Expand All @@ -21,8 +20,6 @@
@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);
@import url("./for-core-styles/trumps/s-header.css") layer(base);
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 7c060cf

Please sign in to comment.