diff --git a/.changeset/sixty-mayflies-guess.md b/.changeset/sixty-mayflies-guess.md new file mode 100644 index 0000000000..e11bc71642 --- /dev/null +++ b/.changeset/sixty-mayflies-guess.md @@ -0,0 +1,5 @@ +--- +'@storefront-ui/vue': patch +--- + +- **[FIXED]** allow to change default `data-testid` attribute on `SfButton` and `SfBadge` components. diff --git a/.github/workflows/cd-v2-automerge.yml b/.github/workflows/cd-v2-automerge.yml index 44cdc71867..92a09e80f4 100644 --- a/.github/workflows/cd-v2-automerge.yml +++ b/.github/workflows/cd-v2-automerge.yml @@ -20,6 +20,6 @@ jobs: uses: actions/checkout@v4 - id: automerge name: automerge - uses: 'pascalgn/automerge-action@v0.16.3' + uses: 'pascalgn/automerge-action@v0.16.4' env: GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' diff --git a/.yarn/patches/sf-docs-base-npm-1.3.2-2dba5f0f27.patch b/.yarn/patches/sf-docs-base-npm-1.3.2-2dba5f0f27.patch new file mode 100644 index 0000000000..2892b619a7 --- /dev/null +++ b/.yarn/patches/sf-docs-base-npm-1.3.2-2dba5f0f27.patch @@ -0,0 +1,340 @@ +diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css +index 3cb249fb096e670af68af7304dc6fa3934dc9460..ef67903c48c39899929a06deae2bec6074a036b6 100644 +--- a/assets/css/tailwind.css ++++ b/assets/css/tailwind.css +@@ -1,101 +1,30 @@ + @import url(https://fonts.bunny.net/css?family=red-hat-display:400,500,600,700,800,900|red-hat-text:400,500,600,700); ++@import "tailwindcss"; ++@import "#build/tailwindcss/sources.css"; ++@import "@storefront-ui/vue/tailwind-config"; ++@plugin "@storefront-ui/typography"; + +-:root { +- /* Primary */ +- --colors-primary-50: 229 255 238; +- --colors-primary-100: 213 255 234; +- --colors-primary-200: 192 242 208; +- --colors-primary-300: 112 255 183; +- --colors-primary-400: 43 253 144; +- --colors-primary-500: 0 225 109; +- --colors-primary-600: 0 192 88; +- --colors-primary-700: 0 128 62; +- --colors-primary-800: 6 117 61; +- --colors-primary-900: 0 51 25; +- +- /* Secondary */ +- --colors-secondary-50: 245 243 255; +- --colors-secondary-100: 237 233 254; +- --colors-secondary-200: 221 214 254; +- --colors-secondary-300: 196 181 253; +- --colors-secondary-400: 167 139 250; +- --colors-secondary-500: 135 92 246; +- --colors-secondary-600: 111 64 236; +- --colors-secondary-700: 97 49 221; +- --colors-secondary-800: 83 30 211; +- --colors-secondary-900: 68 21 178; +- +- /* Positive */ +- --colors-positive-50: 240 253 244; +- --colors-positive-100: 220 252 231; +- --colors-positive-200: 187 247 208; +- --colors-positive-300: 134 239 172; +- --colors-positive-400: 74 222 128; +- --colors-positive-500: 2 198 82; +- --colors-positive-600: 10 171 69; +- --colors-positive-700: 1 137 55; +- --colors-positive-800: 22 101 52; +- --colors-positive-900: 20 83 45; +- +- /* Negative */ +- --colors-negative-50: 255 241 242; +- --colors-negative-100: 255 228 230; +- --colors-negative-200: 254 205 211; +- --colors-negative-300: 253 164 175; +- --colors-negative-400: 251 113 133; +- --colors-negative-500: 244 63 94; +- --colors-negative-600: 225 29 72; +- --colors-negative-700: 190 18 60; +- --colors-negative-800: 159 18 57; +- --colors-negative-900: 136 19 55 1; +- +- /* Warning */ +- --colors-warning-50: 254 252 232; +- --colors-warning-100: 254 249 195; +- --colors-warning-200: 254 240 138; +- --colors-warning-300: 253 224 71; +- --colors-warning-400: 250 204 21; +- --colors-warning-500: 234 179 8; +- --colors-warning-600: 202 138 4; +- --colors-warning-700: 161 98 7; +- --colors-warning-800: 133 77 14; +- --colors-warning-900: 113 63 18; +- +- /* Neutral */ +- --colors-neutral-50: 249 251 250; +- --colors-neutral-100: 242 247 244; +- --colors-neutral-200: 215 224 219; +- --colors-neutral-300: 168 178 171; +- --colors-neutral-400: 129 140 133; +- --colors-neutral-500: 92 102 95; +- --colors-neutral-600: 67 77 70; +- --colors-neutral-700: 44 51 46; +- --colors-neutral-800: 32 38 34; +- --colors-neutral-900: 21 26 22; +- +- /* Disabled */ +- --colors-disabled-50: 250 250 250; +- --colors-disabled-100: 244 244 245; +- --colors-disabled-200: 228 228 231; +- --colors-disabled-300: 212 212 216; +- --colors-disabled-400: 161 161 170; +- --colors-disabled-500: 113 113 122; +- --colors-disabled-600: 82 82 91; +- --colors-disabled-700: 63 63 70; +- --colors-disabled-800: 39 39 42; +- --colors-disabled-900: 24 24 27; +-} +- +-* { +- @apply dark:border-neutral-700; ++@source "./node_modules/sf-docs-base/**/*.vue"; ++ ++@layer base { ++ *, ++ ::before, ++ ::after { ++ border-color: var(--color-neutral-100); ++ } ++ ++ * { ++ @apply dark:border-neutral-700; ++ } + } + ++ + .dark:root { + color-scheme: dark; + } + + .prose code:not(pre code) { +- @apply text-sm bg-neutral-50/20 px-2 py-1 rounded bg-opacity-30 text-neutral-800 dark:bg-neutral-800 dark:text-white font-bold; ++ @apply text-sm bg-neutral-50/20 px-2 py-1 rounded text-neutral-800 dark:bg-neutral-800/30 dark:text-white font-bold; + } + + .prose h1 a, +@@ -138,6 +67,10 @@ + @apply decoration-dashed underline-offset-[4px] font-semibold text-primary-600 dark:text-primary-500 decoration-1 underline hover:decoration-solid transition-all; + } + ++.prose :where(p):not(:where([class~="not-prose"],[class~="not-prose"] *)) { ++ @apply my-5; ++} ++ + .prose table:not(.\!not-prose table):not(.not-prose table) { + @apply table-fixed; + } +@@ -153,3 +86,5 @@ + .has-diff .line.diff.add { + @apply bg-green-400/20; + } ++ ++@config "../../tailwind.config.ts"; +diff --git a/components/app/AppFooter.vue b/components/app/AppFooter.vue +index 2ed81567d25decc39d636a3e73a792d4c9c95fd5..701e1143c501af4795363d63e892dae50428ce11 100644 +--- a/components/app/AppFooter.vue ++++ b/components/app/AppFooter.vue +@@ -22,11 +22,11 @@ const socialsLinks = [ + class="mt-48 text-sm px-6 lg:px-12 2xl:max-w-7xl w-full flex items-center border-t py-4" + > +
+-

© 2024 Alokai.

++

© {{ new Date().getFullYear() }} Alokai.

+
+