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.

Sign up for GitHub

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

Jump to bottom

feat: tup-463 migrate css to core - misc bugs #384

Merged
merged 8 commits into from
Nov 28, 2023
Merged

feat: tup-463 migrate css to core - misc bugs #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2580f35
chore: search dropdown should use var for white
wesleyboar Nov 27, 2023
b60cd23
fix: footer buttons should not have width limit
wesleyboar Nov 27, 2023
21ecddd
refactor: deprecate `<small>` in footer buttons
wesleyboar Nov 27, 2023
bb39b52
fix!: do not let search styles bleed beyond search
wesleyboar Nov 27, 2023
275ecdd
fix: remove unnecessary style
wesleyboar Nov 27, 2023
a1d5e14
docs: explain strange, complex search css selector
wesleyboar Nov 27, 2023
873ac4f
fix: core-styles v2.22.0 to v2.22.1
wesleyboar Nov 27, 2023
bba8603
chore: core-styles v2.22.1 to v2.22.2
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TACC/Core-CMS#678 (core-styles v2.11 to v2.22; migrate css to core-cms|styles)
FROM taccwma/core-cms:d7b7407
# TACC/Core-CMS#753 (core-styles v2.11 to v2.22; migrate css to core-cms|styles)
FROM taccwma/core-cms:fcb82f2

WORKDIR /code

Expand Down
14 changes: 5 additions & 9 deletions ...ms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-cms/trumps/search-elements.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#cms-content {
#tacc-google-search {
/* Whole Search Container */
/* removes padding from search container */
& .gsc-control-cse {
padding: unset;
}

/* make header same as news */
& h1 {
color: var(--global-color-primary--x-dark);
}




Expand All @@ -27,15 +22,16 @@
border-bottom: unset;
}

& tbody>tr:first-child>:is(td, th) {
/* To override Core-Styles tables */
& tbody > tr:first-child > :is(td, th) {
border: unset;
padding-inline: unset;
background: unset;
vertical-align: middle;
}

& .gsc-selected-option-container {
background: #fff;
background: var(--global-color-primary--xx-light);
border: var(--global-border--normal);
}

Expand Down Expand Up @@ -134,4 +130,4 @@
vertical-align: unset;
top: 1px;
}
}
}
18 changes: 18 additions & 0 deletions ...up-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ svg {



/* BUTTONS */

/* To style buttons differently than in body */
.c-footer .c-button,
.c-footer [class*="button--"] {
--max-width: auto; /* override core-styles.base.css */
font-size: 80%; /* mimic Botstrap .small and <small> */

/* TODO: (1) Remove <small> from footer buttons (2) Remove this font-size */
& small {
font-size: inherit; /* gracefully deprecate use of <small> */
}
}





/* LOGOS */

/* To set baseline styles for footer logos */
Expand Down
13 changes: 7 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@nx/vite": "16.5.3",
"@nx/web": "16.5.3",
"@nx/workspace": "16.5.3",
"@tacc/core-styles": "github:TACC/Core-Styles#a06f5af",
"@tacc/core-styles": "^2.22.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
Expand Down
Loading