diff --git a/web/app/themes/sage/resources/styles/base/utilities.css b/web/app/themes/sage/resources/styles/base/utilities.css index 29b99666..a5b2c85f 100644 --- a/web/app/themes/sage/resources/styles/base/utilities.css +++ b/web/app/themes/sage/resources/styles/base/utilities.css @@ -109,7 +109,7 @@ } @utility is-button { - @apply inline-flex cursor-pointer items-center gap-(--button-gap) rounded-(--button-radius) border border-(--button-border-color) bg-(--button-bg-color) px-(--button-padding-x) py-(--button-padding-y) leading-snug! break-words text-(--button-color) no-underline transition-colors select-none; + @apply inline-flex cursor-pointer items-center gap-(--button-gap) rounded-(--button-radius) border-(length:--button-border-width) border-(--button-border-color) bg-(--button-bg-color) px-(--button-padding-x) py-(--button-padding-y) text-(length:--button-font-size) leading-snug! font-(--button-font-weight) wrap-break-word text-(--button-color) no-underline transition-colors select-none; &:active { @apply scale-(--button-scale-active); @@ -117,16 +117,17 @@ @variant hocus { @apply text-(--button-color); /* color is overridden by default a style */ - --button-bg-color: var( --button-bg-color-hover ); - --button-border-color: var( --button-border-color-hover ); - --button-color: var( --button-color-hover ); + --button-after-color: var( --button-after-color-hover ) !important; + --button-bg-color: var( --button-bg-color-hover ) !important; + --button-border-color: var( --button-border-color-hover ) !important; + --button-color: var( --button-color-hover ) !important; } } /* Don't add this to is-button. Pseudo selectors break ::file-selector-button in Chrome. */ @utility add-button-icons { &::after { - @apply fontawesome; + @apply fontawesome text-(--button-after-color) transition-colors; --fa-icon: '\f061'; } diff --git a/web/app/themes/sage/resources/styles/blocks/button/shared.css b/web/app/themes/sage/resources/styles/blocks/button/shared.css index 0daf9c6c..1986f110 100644 --- a/web/app/themes/sage/resources/styles/blocks/button/shared.css +++ b/web/app/themes/sage/resources/styles/blocks/button/shared.css @@ -1,10 +1,15 @@ :root { + --button-after-color-hover: inherit; + --button-after-color: inherit; --button-bg-color-hover: var( --color-primary-700 ); --button-bg-color: var( --color-primary ); - --button-border-color-hover: var( --color-primary ); + --button-border-color-hover: var( --color-primary-700 ); --button-border-color: var( --color-primary ); + --button-border-width: 1px; --button-color-hover: var( --color-white ); --button-color: var( --color-white ); + --button-font-size: var( --text-base ); + --button-font-weight: var( --font-weight-normal ); --button-gap: 0.75em; --button-padding-x: 1.25em; --button-padding-y: 0.75em; diff --git a/web/app/themes/sage/resources/styles/blocks/collapse/editor.css b/web/app/themes/sage/resources/styles/blocks/collapse/editor.css index e9e8672d..c4c69b8e 100644 --- a/web/app/themes/sage/resources/styles/blocks/collapse/editor.css +++ b/web/app/themes/sage/resources/styles/blocks/collapse/editor.css @@ -14,7 +14,7 @@ } .wp-block-yard-collapse-item__header-input { - @apply resize-none! rounded-none border-none bg-inherit p-0 text-(--collapse-button-color) shadow-none; + @apply resize-none! rounded-none border-none bg-inherit p-0 text-(length:--collapse-button-font-size) leading-(--collapse-button-line-height) font-(--collapse-button-font-weight) text-(--collapse-button-color) shadow-none; } .wp-block-yard-collapse-item__header-toggle-button { diff --git a/web/app/themes/sage/resources/styles/blocks/collapse/shared.css b/web/app/themes/sage/resources/styles/blocks/collapse/shared.css index 580bb180..d9bc86ce 100644 --- a/web/app/themes/sage/resources/styles/blocks/collapse/shared.css +++ b/web/app/themes/sage/resources/styles/blocks/collapse/shared.css @@ -8,8 +8,9 @@ --collapse-button-color-hover: var( --color-white ); --collapse-button-color: currentColor; --collapse-button-font-size: var( --text-base ); + --collapse-button-font-weight: var( --font-weight-normal ); --collapse-button-gap: 1rem; - --collapse-button-line-height: 2; + --collapse-button-line-height: var( --text-base--line-height ); --collapse-button-padding-x: 1.5rem; --collapse-button-padding-y: 1rem; @@ -60,7 +61,7 @@ } .wp-block-yard-collapse-item__header-button { - @apply flex items-start justify-between gap-(--collapse-button-gap) rounded-(--collapse-radius) bg-(--collapse-button-bg-color) px-(--collapse-button-padding-x) py-(--collapse-button-padding-y) font-normal text-(--collapse-button-color) transition-all; + @apply flex items-start justify-between gap-(--collapse-button-gap) rounded-(--collapse-radius) bg-(--collapse-button-bg-color) px-(--collapse-button-padding-x) py-(--collapse-button-padding-y) font-(--collapse-button-font-weight) text-(--collapse-button-color) transition-all; &::after { @apply collapse-icon shrink-0; diff --git a/web/app/themes/sage/resources/styles/blocks/tabs/editor.css b/web/app/themes/sage/resources/styles/blocks/tabs/editor.css index 2903519a..2fc5d6e9 100644 --- a/web/app/themes/sage/resources/styles/blocks/tabs/editor.css +++ b/web/app/themes/sage/resources/styles/blocks/tabs/editor.css @@ -19,9 +19,9 @@ } .wp-block-yard-tabs-item__heading-input { - @apply !w-full !resize-none rounded-none border-none bg-transparent p-0 text-(--tabs-button-color) shadow-none; + @apply w-full! resize-none! rounded-none border-none bg-transparent p-0 text-(length:--tabs-button-font-size) leading-(--tabs-button-leading) font-(--tabs-button-font-weight) text-(--tabs-button-color) shadow-none; } .wp-block-yard-tabs-item__panel { - @apply col-start-2 row-start-1 row-end-[100]; + @apply col-start-2 row-start-1 row-end-100; } diff --git a/web/app/themes/sage/resources/styles/blocks/tabs/shared.css b/web/app/themes/sage/resources/styles/blocks/tabs/shared.css index 86f66c7c..3c6e9df9 100644 --- a/web/app/themes/sage/resources/styles/blocks/tabs/shared.css +++ b/web/app/themes/sage/resources/styles/blocks/tabs/shared.css @@ -15,6 +15,9 @@ --tabs-button-color-hover: var( --color-primary ); --tabs-button-color-selected: var( --color-primary ); --tabs-button-color: var( --color-white ); + --tabs-button-font-size: var( --text-base ); + --tabs-button-font-weight-selected: var( --font-weight-normal ); + --tabs-button-font-weight: var( --font-weight-normal ); --tabs-button-gap: 1.25rem; --tabs-button-leading: 1.25; --tabs-button-padding: 1.25rem 1.5rem; @@ -29,6 +32,7 @@ --tabs-button-icon-color-hover: var( --color-white ); --tabs-button-icon-color-selected: var( --color-white ); --tabs-button-icon-color: var( --color-white ); + --tabs-button-icon-radius: var( --radius-theme ); --tabs-button-icon-size: 2rem; --tabs-button-icon: '\f061'; @@ -59,7 +63,7 @@ } .wp-block-yard-tabs-item__heading { - @apply mb-0 bg-(--tabs-list-bg-color) p-(--tabs-list-padding) text-base font-normal md:col-start-1; + @apply mb-0 bg-(--tabs-list-bg-color) p-(--tabs-list-padding) text-(length:--tabs-button-font-size) font-(--tabs-button-font-weight) md:col-start-1; &:not( :first-of-type ) { @apply pt-0; @@ -81,6 +85,9 @@ &:has( .wp-block-yard-tabs-item__button.active ) { --tabs-button-bg-color: var( --tabs-button-bg-color-selected ); --tabs-button-color: var( --tabs-button-color-selected ); + --tabs-button-font-weight: var( + --tabs-button-font-weight-selected + ); --tabs-button-icon-bg-color: var( --tabs-button-icon-bg-color-selected ); @@ -108,7 +115,7 @@ @apply relative flex w-full items-center gap-(--tabs-button-gap) rounded-(--tabs-radius) bg-(--tabs-button-bg-color) p-(--tabs-button-padding) text-left leading-(--tabs-button-leading) text-(--tabs-button-color) transition-colors duration-300; &::before { - @apply fontawesome left-(--tabs-button-padding-x) flex size-(--tabs-button-icon-size) shrink-0 items-center justify-center rounded-(--tabs-radius) border-(length:--tabs-button-icon-border-width) border-(--tabs-button-icon-border-color) bg-(--tabs-button-icon-bg-color) text-(--tabs-button-icon-color) transition-all duration-300; + @apply fontawesome left-(--tabs-button-padding-x) flex size-(--tabs-button-icon-size) shrink-0 items-center justify-center rounded-(--tabs-button-icon-radius) border-(length:--tabs-button-icon-border-width) border-(--tabs-button-icon-border-color) bg-(--tabs-button-icon-bg-color) leading-none text-(--tabs-button-icon-color) transition-all duration-300; --fa-icon: var( --tabs-button-icon ); } diff --git a/web/app/themes/sage/resources/styles/components/facetwp.css b/web/app/themes/sage/resources/styles/components/facetwp.css index 087ef3fd..bb1f15e6 100644 --- a/web/app/themes/sage/resources/styles/components/facetwp.css +++ b/web/app/themes/sage/resources/styles/components/facetwp.css @@ -129,6 +129,10 @@ .fs-wrap { @apply min-w-full; + &.fs-open .fs-label-wrap { + @apply rounded-b-none; + } + .fs-label-wrap { @apply is-select; @@ -240,4 +244,4 @@ dialog .facetwp-type-date_range { @apply right-0! left-auto!; } } -} \ No newline at end of file +} diff --git a/web/app/themes/sage/resources/styles/components/footer.css b/web/app/themes/sage/resources/styles/components/footer.css index 0f12eceb..a26d19da 100644 --- a/web/app/themes/sage/resources/styles/components/footer.css +++ b/web/app/themes/sage/resources/styles/components/footer.css @@ -10,29 +10,3 @@ } } } - -.footer-menu { - .menu-item { - @apply text-sm; - - &::before { - @apply mr-3 content-['|']; - } - - &:first-child::before { - @apply content-none; - } - - a { - @apply text-black no-underline; - - @variant hocus { - @apply underline; - } - } - } -} - -.cky-banner-element + .footer-menu .menu-item:first-child::before { - @apply content-['|']; -} diff --git a/web/app/themes/sage/resources/views/components/facetwp/mobile-filters.blade.php b/web/app/themes/sage/resources/views/components/facetwp/mobile-filters.blade.php index 81a5a690..4f39d650 100644 --- a/web/app/themes/sage/resources/views/components/facetwp/mobile-filters.blade.php +++ b/web/app/themes/sage/resources/views/components/facetwp/mobile-filters.blade.php @@ -4,7 +4,7 @@ 'label' => __('Filters', 'sage'), ]) - + {{ $label }} @@ -29,7 +29,7 @@ class="leading-0 -m-2 flex size-[46px] items-center justify-center text-2xl"> -
+
diff --git a/web/app/themes/sage/resources/views/components/header/mobile-menu.blade.php b/web/app/themes/sage/resources/views/components/header/mobile-menu.blade.php index 59b5b6ee..de80d6c5 100644 --- a/web/app/themes/sage/resources/views/components/header/mobile-menu.blade.php +++ b/web/app/themes/sage/resources/views/components/header/mobile-menu.blade.php @@ -10,13 +10,10 @@ 'label' => __('Menu', 'sage'), ]) - - - - + + + + {{ $label }} diff --git a/web/app/themes/sage/resources/views/components/layout/index.blade.php b/web/app/themes/sage/resources/views/components/layout/index.blade.php index c8a74e89..950ac08b 100644 --- a/web/app/themes/sage/resources/views/components/layout/index.blade.php +++ b/web/app/themes/sage/resources/views/components/layout/index.blade.php @@ -8,32 +8,32 @@ > - - - -
- - {{ __('Skip to content') }} - - - @include('sections.header') - -
- @if (post_password_required()) - @php(the_content()) - @else - - {{ $slot }} - @endif -
- - @include('sections.footer') -
- - - + + + +
+ + {{ __('Skip to content') }} + + + @include('sections.header') + +
+ @if (post_password_required()) + @php(the_content()) + @else + + {{ $slot }} + @endif +
+ + @include('sections.footer') +
+ + +