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.

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

feat: tup-463 migrate css to core #344

Merged
merged 52 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
af717a0
docs: more css thoughts in comment
wesleyboar Oct 11, 2023
6616d03
docs: more css thoughts in comment
wesleyboar Oct 11, 2023
d65bbf2
feat: tup-619 c-content block migration (#346)
R-Tomas-Gonzalez Oct 16, 2023
fd34bdc
feat: tup-623 c-update migration (#348)
R-Tomas-Gonzalez Oct 16, 2023
65d0e0d
feat: tup-624: added generics/attributes to demo (#345)
R-Tomas-Gonzalez Oct 16, 2023
9e90907
feat/tup-625: Migrate o-heading-steps to core-styles (#349)
R-Tomas-Gonzalez Oct 17, 2023
caf95c0
feat/tup-630: Migrate django.cms.blog.app.item (#351)
R-Tomas-Gonzalez Oct 19, 2023
b2d9f2b
Merge branch 'main' into feat/tup-463
wesleyboar Nov 1, 2023
fcd4dc4
feat/tup-632: Migrate django.cms.picture.css to core-cms (#355)
R-Tomas-Gonzalez Nov 2, 2023
73d673c
Merge branch 'main' into feat/tup-463
wesleyboar Nov 2, 2023
a087d26
Migrate c-card fixes to core-styles (#361)
R-Tomas-Gonzalez Nov 2, 2023
fcb4a3e
Migrated header to Core-Styles (#359)
R-Tomas-Gonzalez Nov 3, 2023
23b6fd8
fix: tup-617 c-button font-weight redunant style (#364)
wesleyboar Nov 3, 2023
88c0da4
feat(tup-cms): core-cms with core-styles v2.19
wesleyboar Nov 3, 2023
23dd0d9
Merge branch 'main' into feat/tup-463
wesleyboar Nov 3, 2023
c7e5cd4
chore: lowercase comment
wesleyboar Nov 3, 2023
65c88a9
feat(tup-cms)!: core-cms with core-styles v2.19
wesleyboar Nov 3, 2023
aca968f
feat/tup-634: Migrate pseudo-elements to core-cms (#358)
R-Tomas-Gonzalez Nov 6, 2023
457c6c9
feat/tup-625: delete u-highlight stylesheet (#352)
R-Tomas-Gonzalez Nov 6, 2023
7da8bbb
Migrate card list support to core-styles (#360)
R-Tomas-Gonzalez Nov 6, 2023
a67b340
feat/tup-626: delete o-section from tup-ui (#353)
R-Tomas-Gonzalez Nov 6, 2023
474edaf
feat/tup-633: Migrate lightgallery to core-cms (#357)
R-Tomas-Gonzalez Nov 6, 2023
032bfd2
feat/tup-629: delete footer (#356)
R-Tomas-Gonzalez Nov 6, 2023
960194f
removing all card--image styles (#365)
R-Tomas-Gonzalez Nov 6, 2023
0dcd2ca
chore: tup-616 migrate c-button styles to core-cms (#343)
wesleyboar Nov 7, 2023
b0d490b
feat/tup-622 migrate c-pill to core-styles (#367)
R-Tomas-Gonzalez Nov 9, 2023
d33b976
feat/tup-640 Delete c-card and c-content-block imports (#368)
R-Tomas-Gonzalez Nov 10, 2023
7eab674
Merge branch 'main' into feat/tup-463
wesleyboar Nov 10, 2023
1b0dd28
feat(tup-cms): core-cms with core-styles v2.20
wesleyboar Nov 13, 2023
0e84c10
Merge branch 'feat/tup-463' of github.com:TACC/tup-ui into feat/tup-463
wesleyboar Nov 13, 2023
3167014
feat(tup-ui): core-styles v2.20
wesleyboar Nov 13, 2023
6067b5c
Merge branch 'main' into feat/tup-463
wesleyboar Nov 15, 2023
90163f6
feat(tup-cms): core-styles v2.21 + via core-cms
wesleyboar Nov 16, 2023
0d076a3
feat: tup 648 do not use plain highlight class (#370)
wesleyboar Nov 16, 2023
0de4c11
bug/tup-650: Resetting (unset) padding-block from cms (#371)
R-Tomas-Gonzalez Nov 17, 2023
477b45d
Merge branch 'main' into feat/tup-463
wesleyboar Nov 20, 2023
4560e3b
fix: tup-654 use c-form--login from core-styles (#374)
wesleyboar Nov 20, 2023
853bc51
chore: tup-463 remove temp. core-styles imports (#375)
wesleyboar Nov 20, 2023
b93cfce
enhance: tup-463 login component should use core-styles (#376)
wesleyboar Nov 20, 2023
cc7763b
chore: tup-463 delete css modules mimicking core (#377)
wesleyboar Nov 21, 2023
7e11f10
feat: core-styles v2.21.0 to v2.21.1
wesleyboar Nov 21, 2023
bee6a46
feat: core-cms, core-styles v2.21.0 to v2.21.1
wesleyboar Nov 21, 2023
f73211e
hotfix: tup-654 mfa c nav pipe not showing (#379)
wesleyboar Nov 21, 2023
d3165a2
chore: remove redundant import of cortal.icon.css (#380)
wesleyboar Nov 21, 2023
27d6d43
hotfix: tup-658 login form title too small (#381)
wesleyboar Nov 21, 2023
5a7597a
feat: core-cms, core-styles v2.21.1 to v2.21.2
wesleyboar Nov 21, 2023
c9afd96
feat: core-cms, core-styles v2.21 to v2.22
wesleyboar Nov 22, 2023
de66170
Merge branch 'main' into feat/tup-463
wesleyboar Nov 27, 2023
c7d3a70
feat: core-cms w/ core-styles' django-cms-forms
wesleyboar Nov 27, 2023
d23a92c
fix: core-cms core-styles' django-cms-forms
wesleyboar Nov 27, 2023
7b22940
feat: tup-463 migrate css to core - misc bugs (#384)
wesleyboar Nov 28, 2023
9877ccd
chore: core-cms v4.2.0
wesleyboar Nov 28, 2023
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
4 changes: 2 additions & 2 deletions apps/tup-cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TACC/Core-CMS#735 (cms-forms export hotfix)
FROM taccwma/core-cms:5ceecdd
# TACC/Core-CMS#742 (Core-Styles v2.11 to v2.19)
wesleyboar marked this conversation as resolved.
Show resolved Hide resolved
FROM taccwma/core-cms:7975138

WORKDIR /code

Expand Down

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,29 +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 `*/
}

/* To more specifically control c-card link font weight */
/* !!!: 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--"]) a.c-button:where(:not(#page-portal *)) {
font-weight: var(--bold);
}

/* 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