Skip to content

Commit

Permalink
feat: tup-463 migrate css to core - misc bugs (#384)
Browse files Browse the repository at this point in the history
* chore: search dropdown should use var for white

* fix: footer buttons should not have width limit

* refactor: deprecate `<small>` in footer buttons

* fix!: do not let search styles bleed beyond search

Requires an `id="tacc-google-search` wrapper.

* fix: remove unnecessary style

The only `<h1>` on the page is "Search" text provided by CMS not Google.

* docs: explain strange, complex search css selector

* fix: core-styles v2.22.0 to v2.22.1

* chore: core-styles v2.22.1 to v2.22.2
  • Loading branch information
wesleyboar authored Nov 28, 2023
1 parent d23a92c commit 7b22940
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 18 deletions.
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#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
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;
}
}
}
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

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

0 comments on commit 7b22940

Please sign in to comment.