Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
33935c6
fix: breaking change - sfbutton padding size (#2815) (#2829)
aniamusial Jun 27, 2023
a2bb3a2
fix!: changed paddings in sfselect (#2864)
aniamusial Jun 29, 2023
bbec9e1
fix!: remove flex classes from SfListItem (#2902)
justyna-13 Jul 5, 2023
727a192
chore!: remove deprecated useTrapFocus arrowKeysOn option [SFUI2-1273…
Szymon-dziewonski Oct 6, 2023
85eb04d
docs: update vue.md (#3260)
michaelsynan Jan 21, 2025
e336fb1
Merge pull request #3257 from vuestorefront/v2
github-actions[bot] Mar 18, 2025
4465ff2
chore(deps): bump koa from 2.15.3 to 2.15.4 (#3269)
dependabot[bot] May 22, 2025
8882cb7
chore(deps): :arrow_up: Update dependency next to v14.2.21 [SECURITY]…
renovate[bot] Jul 29, 2025
69cef93
chore(deps): :arrow_up: Update devDependency postcss to v8.4.49 (#3217)
renovate[bot] Jul 29, 2025
9b03182
chore(deps): update pascalgn/automerge-action action to v0.16.4 (#3246)
renovate[bot] Jul 29, 2025
d85de86
chore(deps): :arrow_up: Update definitelyTyped (#3250)
renovate[bot] Jul 29, 2025
ac70aa4
chore(deps): :arrow_up: Update resolutions vue to v3.5.13 (#3245)
renovate[bot] Jul 29, 2025
07dc2a2
chore(deps): :arrow_up: Update linters (#3251)
renovate[bot] Jul 29, 2025
3f49509
chore(deps): :arrow_up: Update Yarn to v3.8.7 (#3258)
renovate[bot] Jul 29, 2025
8b35d65
chore(deps): update cypress-io/github-action action to v6.7.8 (#3259)
renovate[bot] Jul 29, 2025
83f19e8
chore(deps): :arrow_up: Update all minor and patch dependency bump (#…
renovate[bot] Aug 1, 2025
31aa18f
feat: migrate tailwind color palette (#3282)
FRSgit Aug 13, 2025
c850705
feat: redesign button (#3283)
FRSgit Aug 19, 2025
a3dc358
feat: redesign display block (#3284)
FRSgit Aug 21, 2025
77a1679
feat: redesign hero block (#3288)
FRSgit Aug 21, 2025
ca8ac4e
chore(deps): bump koa from 2.15.4 to 2.16.2 (#3287)
dependabot[bot] Aug 21, 2025
d71d35f
chore(deps): bump form-data from 4.0.1 to 4.0.4 (#3285)
dependabot[bot] Aug 21, 2025
6e609e7
feat: redesign base components (#3289)
FRSgit Aug 29, 2025
4e20663
chore: redesign card (#3290)
FRSgit Aug 30, 2025
a8dd938
feat: batch up for components (#3292)
Szymon-dziewonski Sep 2, 2025
a31fc05
fix: next preview app build (#3293)
FRSgit Sep 3, 2025
8cb4b8e
chore(deps): bump next from 14.2.22 to 14.2.32 (#3291)
dependabot[bot] Sep 3, 2025
08e30c7
chore: merge branch 'v2-develop' into v2-release/3.0.0
FRSgit Sep 3, 2025
33f2db8
Merge pull request #3300 from vuestorefront/v2
WojtekTheWebDev Sep 23, 2025
cf60005
Merge pull request #3304 from vuestorefront/v2
github-actions[bot] Sep 23, 2025
56d80d3
feat: redo checkbox component (#3295)
Szymon-dziewonski Sep 25, 2025
10f4399
Merge branch 'v2-develop' into v2-release/3.0.0
Szymon-dziewonski Sep 25, 2025
c6e4ddd
feat: add tailwind-merge for tailwind classes (#3298)
Szymon-dziewonski Oct 3, 2025
15e4549
feat: tailwind 4 migration (#3281)
FRSgit Oct 30, 2025
1deaa0a
fix: after upgrade base components (#3313)
FRSgit Nov 3, 2025
3116042
feat: redo showcases with new tailwind (#3314)
FRSgit Nov 6, 2025
1e3dada
chore: merge branch 'v2-develop' into v2-release/3.0.0
FRSgit Nov 6, 2025
75eb3da
ci: version packages (#2886)
github-actions[bot] Nov 6, 2025
80facae
chore: use workspace vue & tailwind for building docs
FRSgit Nov 7, 2025
a7a861b
fix: typography plugin css vars (#3317)
FRSgit Nov 12, 2025
d9c53a7
Merge branch 'v2-develop' into v2-release/3.0.0
FRSgit Nov 12, 2025
a1b83bd
ci: version packages (#3318)
github-actions[bot] Nov 12, 2025
fe020f9
chore: update lockfile
FRSgit Nov 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/cd-v2-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
340 changes: 340 additions & 0 deletions .yarn/patches/sf-docs-base-npm-1.3.2-2dba5f0f27.patch
Original file line number Diff line number Diff line change
@@ -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"
>
<div class="opacity-80 flex-1 text-xs">
- <p>© 2024 Alokai.</p>
+ <p>© {{ new Date().getFullYear() }} Alokai.</p>
</div>
<nav class="flex items-center mx-auto font-medium gap-x-8">
<NuxtLink
- to="/contributing"
+ to="https://docs.alokai.com/contributing"
class="opacity-80 hover:opacity-100 transition-opacity"
>
Contributing
diff --git a/components/app/AppLayout.vue b/components/app/AppLayout.vue
index d6e7977d68497431f89ab680134a4a58cb6e501f..91978a51681e29fcecefb6afbbbe6afaa7e5869d 100644
--- a/components/app/AppLayout.vue
+++ b/components/app/AppLayout.vue
@@ -16,16 +16,21 @@ const { storefrontUi } = useRuntimeConfig().public
height="2rem"
class="[&>*]:!fill-white"
/>
- <NuxtLink
- to="https://docs.vuestorefront.io"
- class="font-medium flex items-center text-sm group text-white"
- >
- Build Better Storefronts
- <Icon
- name="ri:arrow-right-s-fill"
- class="text-xl group-hover:translate-x-px transition-transform"
- />
- </NuxtLink>
+ <div class="flex items-center gap-x-2 text-white">
+ Vue Storefront is now Alokai!
+ <NuxtLink
+ to="https://alokai.com/news/vue-storefront-is-now-alokai"
+ target="_blank"
+ external
+ class="font-medium flex items-center text-sm group underline hover:no-underline focus-visible:no-underline"
+ >
+ Learn More
+ <Icon
+ name="ri:arrow-right-s-fill"
+ class="text-xl group-hover:translate-x-px transition-transform"
+ />
+ </NuxtLink>
+ </div>
</div>
<div
v-else
@@ -84,6 +89,8 @@ const { storefrontUi } = useRuntimeConfig().public
</template>

<style>
+@reference "../../assets/css/tailwind.css";
+
.dark {
@apply bg-neutral-900;
}
diff --git a/components/content/Info.vue b/components/content/Info.vue
index 843dfad268b9601d5cc3df739da859e8e54322f0..c186336ab418d58d51ac944d63af2273dc229e21 100644
--- a/components/content/Info.vue
+++ b/components/content/Info.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-secondary-800/20 [&>*>code]:!text-secondary-900 [&>*>code]:dark:!text-secondary-50 border-secondary-500 dark:border-secondary-500 border rounded-lg bg-secondary-500 bg-opacity-20 text-sm dark:text-secondary-100 text-secondary-800"
+ class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-secondary-800/20 [&>*>code]:!text-secondary-900 [&>*>code]:dark:!text-secondary-50 border-secondary-500 dark:border-secondary-500 dark:bg-secondary-800 border rounded-lg bg-secondary-200 bg-opacity-20 text-sm dark:text-secondary-100 text-secondary-800"
>
<p v-if="$slots.title" class="text-base font-bold mb-2">
<ContentSlot :use="$slots.title" unwrap="p" />
diff --git a/components/content/ReadMore.vue b/components/content/ReadMore.vue
index 843dfad268b9601d5cc3df739da859e8e54322f0..c186336ab418d58d51ac944d63af2273dc229e21 100644
--- a/components/content/ReadMore.vue
+++ b/components/content/ReadMore.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-secondary-800/20 [&>*>code]:!text-secondary-900 [&>*>code]:dark:!text-secondary-50 border-secondary-500 dark:border-secondary-500 border rounded-lg bg-secondary-500 bg-opacity-20 text-sm dark:text-secondary-100 text-secondary-800"
+ class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-secondary-800/20 [&>*>code]:!text-secondary-900 [&>*>code]:dark:!text-secondary-50 border-secondary-500 dark:border-secondary-500 dark:bg-secondary-800 border rounded-lg bg-secondary-200 bg-opacity-20 text-sm dark:text-secondary-100 text-secondary-800"
>
<p v-if="$slots.title" class="text-base font-bold mb-2">
<ContentSlot :use="$slots.title" unwrap="p" />
diff --git a/components/content/ReferenceToggle.vue b/components/content/ReferenceToggle.vue
index aea94bc0b7338822f34e2ec1d960d714f9d036aa..96ecc3b3dba5e484a1432d1ad308db409534f646 100644
--- a/components/content/ReferenceToggle.vue
+++ b/components/content/ReferenceToggle.vue
@@ -32,6 +32,8 @@ const open = ref(true)
</template>

<style scoped>
+@reference "../../assets/css/tailwind.css";
+
:slotted(hr) {
@apply my-4;
}
diff --git a/components/content/Tip.vue b/components/content/Tip.vue
index a7e89bf3e92e9cf338ea26e5aeacb78c03a333eb..040a51314836b9c2cb9643723fba385f2b948e0a 100644
--- a/components/content/Tip.vue
+++ b/components/content/Tip.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-primary-800/20 [&>*>code]:!text-primary-900 [&>*>code]:dark:!text-primary-50 border-primary-500 dark:border-primary-500 border rounded-lg bg-primary-500 bg-opacity-20 text-sm dark:text-primary-100 text-primary-800"
+ class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-primary-800/20 [&>*>code]:!text-primary-900 [&>*>code]:dark:!text-primary-50 border-primary-500 dark:border-primary-500 border rounded-lg dark:bg-primary-800 bg-primary-200 bg-opacity-20 text-sm dark:text-primary-100 text-primary-800"
>
<p v-if="$slots.title" class="text-base font-bold mb-2">
<ContentSlot :use="$slots.title" unwrap="p" />
diff --git a/components/content/Warning.vue b/components/content/Warning.vue
index 7006837f6030ad8cc3a836c7dfbeea1b958b1be7..253ed324aac9bad8a703444235dac85ac2e4f349 100644
--- a/components/content/Warning.vue
+++ b/components/content/Warning.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-yellow-800/20 [&>*>code]:!text-yellow-900 [&>*>code]:dark:!text-yellow-50 border-yellow-500 dark:border-yellow-500 border rounded-lg bg-yellow-500 bg-opacity-20 text-sm dark:text-yellow-100 text-yellow-800"
+ class="mt-5 leading-relaxed not-prose [&>*>a]:underline px-6 py-4 [&>*>code]:!bg-yellow-800/20 [&>*>code]:!text-yellow-900 [&>*>code]:dark:!text-yellow-50 border-yellow-500 dark:border-yellow-500 border rounded-lg dark:bg-yellow-950 bg-yellow-50 bg-opacity-20 text-sm dark:text-yellow-100 text-yellow-800"
>
<p v-if="$slots.title" class="text-base font-bold mb-2">
<ContentSlot :use="$slots.title" unwrap="p" />
diff --git a/components/content/prose/ProseCode.vue b/components/content/prose/ProseCode.vue
index fe4772a0eacbe0d6a135c98a895f35d372083b22..c864836cfbbd8d8ac6dafcc1acd1313955c377d7 100644
--- a/components/content/prose/ProseCode.vue
+++ b/components/content/prose/ProseCode.vue
@@ -57,13 +57,15 @@ const copyCode = async () => {
</template>

<style scoped>
+@reference "../../../assets/css/tailwind.css";
+
.code-wrapper {
@apply rounded-lg bg-neutral-800;
counter-reset: lines;
}

:slotted(pre) {
- @apply bg-neutral-800 overflow-x-auto w-full !important;
+ @apply bg-neutral-800 overflow-x-auto w-full;
}

:deep(pre code .line) {
diff --git a/layouts/fullscreen.vue b/layouts/fullscreen.vue
index 394e012a754e1cfce1a9a29f58b95bf7e08b4766..28be2b8fce92fe0d2b14f173e652a0f4aeb3690d 100644
--- a/layouts/fullscreen.vue
+++ b/layouts/fullscreen.vue
@@ -5,6 +5,8 @@
</template>

<style>
+@reference "../assets/css/tailwind.css";
+
.fullscreen article > div > p {
@apply max-w-3xl;
}
diff --git a/package.json b/package.json
index f95d0989b5bf8453075bd6b751a4435e3cd6dc00..c1f5b9bcfbfa9bc62104126f4e9be73f48ce48bb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"@nuxtjs/algolia": "^1.8.0",
"@nuxtjs/color-mode": "^3.2.0",
"@nuxtjs/seo": "^2.0.0-rc.10",
- "@nuxtjs/tailwindcss": "^6.11.4",
+ "@nuxtjs/tailwindcss": "^7.0.0-beta.1",
"@storefront-ui/typography": "^2.1.0",
"@storefront-ui/vue": "^2.1.0",
"@tailwindcss/typography": "^0.5.9",
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 27f5ddd96f83fa77254d9845cacab9244e2b297a..90141390f624afa977dce61211901f42433e5f43 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -1,6 +1,4 @@
import type { Config } from 'tailwindcss'
-import { tailwindConfig } from '@storefront-ui/vue/tailwind-config'
-import tailwindTypography from '@tailwindcss/typography'

const disabledCss = {
'code::before': false,
@@ -14,10 +12,6 @@ const disabledCss = {
}

export default <Config>{
- presets: [tailwindConfig],
- darkMode: 'class',
- content: [],
- safelist: ['dark:fill-white', 'dark:invert', '!text-xs}'],
theme: {
extend: {
typography: {
@@ -29,5 +23,4 @@ export default <Config>{
},
},
},
- plugins: [tailwindTypography],
}
Loading
Loading