From eef0dd0fafa5dbbbd29f2162967bc668eebf6074 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Wed, 20 Dec 2023 17:09:39 +0100 Subject: fix(styles): increase CSS specifity for some selectors Since `sideEffects` has been added to activate tree shakings, the styles are imported in the wrong order in production build. There is an open issue (again) on Next.js repo. I'm not sure it will be fixed soon so in the meantime I had to increase the specifity of some selectors to avoid broken styles. I also fixed two minor layout errors: * CV page widgets should use headings of level 2 * Homepage should wrap the cards in list items --- .../meta-list/meta-item/meta-item.module.scss | 1 + .../forms/search-form/search-form.module.scss | 55 +++--- .../nav/breadcrumbs/breadcrumbs.module.scss | 4 - .../organisms/nav/breadcrumbs/breadcrumbs.tsx | 5 +- .../navbar/navbar-item/navbar-item.module.scss | 200 +++++++++++---------- src/components/templates/page/page.module.scss | 12 +- src/pages/cv.tsx | 14 +- src/pages/index.tsx | 66 ++++--- src/styles/pages/home.module.scss | 3 + 9 files changed, 183 insertions(+), 177 deletions(-) create mode 100644 src/styles/pages/home.module.scss diff --git a/src/components/molecules/meta-list/meta-item/meta-item.module.scss b/src/components/molecules/meta-list/meta-item/meta-item.module.scss index a1c2d47..263a5dc 100644 --- a/src/components/molecules/meta-list/meta-item/meta-item.module.scss +++ b/src/components/molecules/meta-list/meta-item/meta-item.module.scss @@ -31,6 +31,7 @@ .value { width: fit-content; height: fit-content; + padding-block: fun.convert-px(2); color: var(--color-fg); font-weight: 400; } diff --git a/src/components/organisms/forms/search-form/search-form.module.scss b/src/components/organisms/forms/search-form/search-form.module.scss index f6570ce..1a440f0 100644 --- a/src/components/organisms/forms/search-form/search-form.module.scss +++ b/src/components/organisms/forms/search-form/search-form.module.scss @@ -10,52 +10,53 @@ transition: all 0.3s ease-in-out 0s; } -.btn { - background: var(--color-bg-tertiary); - border: fun.convert-px(2) solid var(--color-border); - box-shadow: fun.convert-px(3) fun.convert-px(3) 0 0 var(--color-shadow); - transition: all 0.25s linear 0s; +.form { + display: flex; + flex-flow: row nowrap; + + /* It needs to be nested because of wrong CSS ordering on production build. */ + .btn { + background: var(--color-bg-tertiary); + border: fun.convert-px(2) solid var(--color-border); + box-shadow: fun.convert-px(3) fun.convert-px(3) 0 0 var(--color-shadow); + transition: all 0.25s linear 0s; + } + + &--no-label { + .btn { + align-self: stretch; + } + } + + &--has-label { + .btn { + align-self: flex-end; + height: fun.convert-px(52); + } + } - &:hover, - &:focus { + .btn:hover, + .btn:focus { .icon { transform: scale(0.85) rotate(20deg) translateX(#{fun.convert-px(2)}) translateY(#{fun.convert-px(3)}); } } - &:focus { + .btn:focus { outline: none; border-color: var(--color-primary); box-shadow: fun.convert-px(3) fun.convert-px(3) 0 0 var(--color-primary-dark); } - &:active { + .btn:active { .icon { transform: scale(0.7); } } } -.form { - display: flex; - flex-flow: row nowrap; - - &--no-label { - .btn { - align-self: stretch; - } - } - - &--has-label { - .btn { - align-self: flex-end; - height: fun.convert-px(52); - } - } -} - .field { min-width: 0; diff --git a/src/components/organisms/nav/breadcrumbs/breadcrumbs.module.scss b/src/components/organisms/nav/breadcrumbs/breadcrumbs.module.scss index 1be81c4..b1b2302 100644 --- a/src/components/organisms/nav/breadcrumbs/breadcrumbs.module.scss +++ b/src/components/organisms/nav/breadcrumbs/breadcrumbs.module.scss @@ -1,7 +1,3 @@ -.wrapper { - width: fit-content; -} - .sep { margin-inline-start: var(--spacing-xs); } diff --git a/src/components/organisms/nav/breadcrumbs/breadcrumbs.tsx b/src/components/organisms/nav/breadcrumbs/breadcrumbs.tsx index 13434e1..fd29f90 100644 --- a/src/components/organisms/nav/breadcrumbs/breadcrumbs.tsx +++ b/src/components/organisms/nav/breadcrumbs/breadcrumbs.tsx @@ -28,12 +28,11 @@ export type BreadcrumbsProps = Omit & { const BreadcrumbsWithRef: ForwardRefRenderFunction< HTMLElement, BreadcrumbsProps -> = ({ className = '', items, ...props }, ref) => { - const wrapperClass = `${styles.wrapper} ${className}`; +> = ({ items, ...props }, ref) => { const sep = '>'; return ( -