Skip to content

Commit 3a59207

Browse files
Szymon-dziewonskiSzymon-dziewonski
authored
chore(release): 2.6.1 (#3076)
1 parent de186a8 commit 3a59207

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1638
-1215
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @Szymon-dziewonski @frsgit @dkacper @mattmaribojoc
1+
* @Szymon-dziewonski @frsgit @mattmaribojoc @filrak @skirianov

‎.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ contact_links:
55
about: Find more information about the project and how to use it.
66
- name: Discord Chat
77
url: https://discord.vuestorefront.io/
8-
about: Ask questions and discuss with other Vue Storefront users in real time.
8+
about: Ask questions and discuss with other Alokai users in real time.

‎.github/workflows/ci.yml

+21-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
run: cd apps/test/vue; yarn generate-coverage
149149
- name: SonarCloud Scan
150150
if: ${{ env.SONAR_TOKEN_VUE }}
151-
uses: SonarSource/sonarcloud-github-action@v1.9
151+
uses: SonarSource/sonarcloud-github-action@v2.1.1
152152
with:
153153
projectBaseDir: packages/sfui/frameworks/vue
154154
env:
@@ -183,7 +183,7 @@ jobs:
183183
run: cd apps/test/react; yarn generate-coverage
184184
- name: SonarCloud Scan
185185
if: ${{ env.SONAR_TOKEN_REACT }}
186-
uses: SonarSource/sonarcloud-github-action@v1.9
186+
uses: SonarSource/sonarcloud-github-action@v2.1.1
187187
with:
188188
projectBaseDir: packages/sfui/frameworks/react
189189
env:
@@ -303,3 +303,22 @@ jobs:
303303
env:
304304
GH_TOKEN: ${{ github.token }}
305305
run: gh pr merge --auto --merge
306+
307+
gg-scanning:
308+
name: GitGuardian scan
309+
runs-on: ubuntu-latest
310+
steps:
311+
- name: Checkout
312+
uses: actions/checkout@v3
313+
with:
314+
fetch-depth: 0
315+
- name: GitGuardian scan
316+
uses: GitGuardian/[email protected]
317+
with:
318+
args: -v
319+
env:
320+
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
321+
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
322+
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
323+
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
324+
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,5 @@ apps/docs/components/utils/components.json
6565
apps/docs/components/utils/showcases.json
6666
apps/docs/components/utils/hooks.json
6767
apps/docs/components/utils/blocks.json
68+
69+
.cache_ggshield

‎.yarn/releases/yarn-3.6.3.cjs

-874
This file was deleted.

‎.yarn/releases/yarn-3.7.0.cjs

+875
Large diffs are not rendered by default.

‎.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
55
spec: '@yarnpkg/plugin-workspace-tools'
66

7-
yarnPath: .yarn/releases/yarn-3.6.3.cjs
7+
yarnPath: .yarn/releases/yarn-3.7.0.cjs

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 Vue Storefront
3+
Copyright (c) 2024 Alokai
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ Knowing this we recommend using `yarn dev` in `root` directory.
9999
- [Playground Vue](https://play-vue.vuestorefront.io)
100100
- [Playground React](https://play-react.vuestorefront.io)
101101
- [Discord](https://discord.vuestorefront.io)
102-
- [Vue Storefront](https://vuestorefront.io)
102+
- [Alokai](https://vuestorefront.io)

‎apps/docs/components/ai-assistant.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ layout: EmbedLayout
55
<div class="custom-block">
66
<iframe
77
src="https://chat.fwdoperators.com/?cid=3fd362f4-2a88-4d27-b2d7-d067265b0280"
8-
style="width: 100%; min-height: 90vh; border: none;"
8+
style="width: 100%; min-height: 90vh; border: none; margin-top: 20px;"
99
allow="clipboard-write"
1010
/>
1111
</div>

‎apps/docs/components/components/iconbase.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ List of all icons shipped with Storefront UI below. Click on any of the icons to
2828

2929
### Sizes
3030

31-
All Icon components supports various sizes that can be set with the `size` prop: `'xs'`, `'sm'`, `'base'`, `'lg'`, `'xl'`, `'2xl'`, `'3xl'`, `'4xl'`.
31+
All Icon components supports various sizes that can be set with the `size` prop: `'xs'`, `'sm'`, `'base'`, `'lg'`, `'xl'`, `'2xl'`, `'3xl'`, `'4xl'` . Size can be overwritten by applying new styling on icon.
3232

3333
<Showcase showcase-name="IconBase/IconBaseSizes" style="min-height:300px">
3434

‎apps/docs/components/customization/theming.md

+74-73
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ hideBreadcrumbs: true
55

66
# Theming
77

8-
To help you build your storefront, Storefront UI adds additional colors following Tailwind's shading conventions. These can be customized customized with CSS variables or Tailwind configuration to match your design system.
8+
UI colors are based on 10-tone Tailwind default color palette, normalized so that each color at the same brightness level meets identical minimum accessibility requirements.
9+
10+
To help you build your storefront, Storefront UI adds additional colors following Tailwind's shading conventions. These can be customized customized with CSS variables or Tailwind configuration to match your design system.
911

1012
## Default Values
1113

@@ -17,7 +19,6 @@ In addition to [Tailwind's default colors](https://tailwindcss.com/docs/customiz
1719
You can see all of the default colors, classes, variants, and more in our [Tailwind preset](https://github.com/vuestorefront/storefront-ui/blob/v2/packages/config/tailwind/index.ts)
1820
:::
1921

20-
2122
## Customizing colors
2223

2324
### CSS Variables
@@ -67,88 +68,88 @@ The CSS classes for Storefront UI colors follow the pattern of `--colors-{color}
6768
```css
6869
:root {
6970
/* Primary */
70-
--colors-primary-50: 240 253 244;
71-
--colors-primary-100: 220 252 231;
72-
--colors-primary-200: 187 247 208;
73-
--colors-primary-300: 134 239 172;
74-
--colors-primary-400: 74 222 128;
75-
--colors-primary-500: 2 198 82;
76-
--colors-primary-600: 10 171 69;
77-
--colors-primary-700: 1 137 55;
78-
--colors-primary-800: 22 101 52;
79-
--colors-primary-900: 20 83 45;
71+
--colors-primary-50: 235 255 242;
72+
--colors-primary-100: 217 253 228;
73+
--colors-primary-200: 171 241 192;
74+
--colors-primary-300: 130 234 158;
75+
--colors-primary-400: 60 224 120;
76+
--colors-primary-500: 19 195 96;
77+
--colors-primary-600: 7 161 79;
78+
--colors-primary-700: 13 127 63;
79+
--colors-primary-800: 16 86 46;
80+
--colors-primary-900: 15 50 30;
8081

8182
/* Secondary */
82-
--colors-secondary-50: 245 243 255;
83-
--colors-secondary-100: 237 233 254;
84-
--colors-secondary-200: 221 214 254;
85-
--colors-secondary-300: 196 181 253;
86-
--colors-secondary-400: 167 139 250;
87-
--colors-secondary-500: 135 92 246;
88-
--colors-secondary-600: 111 64 236;
89-
--colors-secondary-700: 97 49 221;
90-
--colors-secondary-800: 83 30 211;
91-
--colors-secondary-900: 68 21 178;
83+
--colors-secondary-50: 247 245 253;
84+
--colors-secondary-100: 239 236 251;
85+
--colors-secondary-200: 225 218 246;
86+
--colors-secondary-300: 216 203 245;
87+
--colors-secondary-400: 198 177 246;
88+
--colors-secondary-500: 180 151 249;
89+
--colors-secondary-600: 151 111 238;
90+
--colors-secondary-700: 119 79 209;
91+
--colors-secondary-800: 82 52 153;
92+
--colors-secondary-900: 48 32 86;
9293

9394
/* Positive */
94-
--colors-positive-50: 240 253 244;
95-
--colors-positive-100: 220 252 231;
96-
--colors-positive-200: 187 247 208;
97-
--colors-positive-300: 134 239 172;
98-
--colors-positive-400: 74 222 128;
99-
--colors-positive-500: 2 198 82;
100-
--colors-positive-600: 10 171 69;
101-
--colors-positive-700: 1 137 55;
102-
--colors-positive-800: 22 101 52;
103-
--colors-positive-900: 20 83 45;
95+
--colors-positive-50: 235 255 242;
96+
--colors-positive-100: 217 253 228;
97+
--colors-positive-200: 171 241 192;
98+
--colors-positive-300: 130 234 158;
99+
--colors-positive-400: 60 224 120;
100+
--colors-positive-500: 19 195 96;
101+
--colors-positive-600: 7 161 79;
102+
--colors-positive-700: 13 127 63;
103+
--colors-positive-800: 16 86 46;
104+
--colors-positive-900: 15 50 30;
104105

105106
/* Negative */
106-
--colors-negative-50: 255 241 242;
107-
--colors-negative-100: 255 228 230;
108-
--colors-negative-200: 254 205 211;
109-
--colors-negative-300: 253 164 175;
110-
--colors-negative-400: 251 113 133;
111-
--colors-negative-500: 244 63 94;
112-
--colors-negative-600: 225 29 72;
113-
--colors-negative-700: 190 18 60;
114-
--colors-negative-800: 159 18 57;
115-
--colors-negative-900: 136 19 55 1;
107+
--colors-negative-50: 255 245 247;
108+
--colors-negative-100: 255 232 237;
109+
--colors-negative-200: 254 211 219;
110+
--colors-negative-300: 253 193 202;
111+
--colors-negative-400: 255 163 175;
112+
--colors-negative-500: 255 127 143;
113+
--colors-negative-600: 240 59 91;
114+
--colors-negative-700: 208 13 48;
115+
--colors-negative-800: 141 8 33;
116+
--colors-negative-900: 76 15 23;
116117

117118
/* Warning */
118-
--colors-warning-50: 254 252 232;
119-
--colors-warning-100: 254 249 195;
120-
--colors-warning-200: 254 240 138;
121-
--colors-warning-300: 253 224 71;
122-
--colors-warning-400: 250 204 21;
123-
--colors-warning-500: 234 179 8;
124-
--colors-warning-600: 202 138 4;
125-
--colors-warning-700: 161 98 7;
126-
--colors-warning-800: 133 77 14;
127-
--colors-warning-900: 113 63 18;
119+
--colors-warning-50: 254 247 236;
120+
--colors-warning-100: 255 238 211;
121+
--colors-warning-200: 254 220 165;
122+
--colors-warning-300: 254 202 132;
123+
--colors-warning-400: 255 181 77;
124+
--colors-warning-500: 237 153 14;
125+
--colors-warning-600: 191 121 17;
126+
--colors-warning-700: 157 93 3;
127+
--colors-warning-800: 109 63 9;
128+
--colors-warning-900: 62 35 10;
128129

129130
/* Neutral */
130-
--colors-neutral-50: 250 250 250;
131-
--colors-neutral-100: 244 244 245;
132-
--colors-neutral-200: 228 228 231;
133-
--colors-neutral-300: 212 212 216;
134-
--colors-neutral-400: 161 161 170;
135-
--colors-neutral-500: 113 113 122;
136-
--colors-neutral-600: 82 82 91;
137-
--colors-neutral-700: 63 63 70;
138-
--colors-neutral-800: 39 39 42;
139-
--colors-neutral-900: 24 24 27;
131+
--colors-neutral-50: 249 251 250;
132+
--colors-neutral-100: 239 244 241;
133+
--colors-neutral-200: 217 226 220;
134+
--colors-neutral-300: 187 198 190;
135+
--colors-neutral-400: 129 140 133;
136+
--colors-neutral-500: 100 111 104;
137+
--colors-neutral-600: 77 86 79;
138+
--colors-neutral-700: 56 65 59;
139+
--colors-neutral-800: 37 43 39;
140+
--colors-neutral-900: 21 26 22;
140141

141142
/* Disabled */
142-
--colors-disabled-50: 250 250 250;
143-
--colors-disabled-100: 244 244 245;
144-
--colors-disabled-200: 228 228 231;
145-
--colors-disabled-300: 212 212 216;
146-
--colors-disabled-400: 161 161 170;
147-
--colors-disabled-500: 113 113 122;
148-
--colors-disabled-600: 82 82 91;
149-
--colors-disabled-700: 63 63 70;
150-
--colors-disabled-800: 39 39 42;
151-
--colors-disabled-900: 24 24 27;
143+
--colors-disabled-50: 249 251 250;
144+
--colors-disabled-100: 239 244 241;
145+
--colors-disabled-200: 217 226 220;
146+
--colors-disabled-300: 187 198 190;
147+
--colors-disabled-400: 129 140 133;
148+
--colors-disabled-500: 100 111 104;
149+
--colors-disabled-600: 77 86 79;
150+
--colors-disabled-700: 56 65 59;
151+
--colors-disabled-800: 37 43 39;
152+
--colors-disabled-900: 21 26 22;
152153
}
153154
```
154155
</SourceCode>
@@ -189,4 +190,4 @@ export default {
189190

190191
:::read-more
191192
To learn more about the different ways to declare colors in Tailwind, check out the [Tailwind documentation](https://tailwindcss.com/docs/customizing-colors#using-custom-colors).
192-
:::
193+
:::

‎apps/preview/next/pages/showcases/Footer/FooterBasic.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export default function FooterBasic() {
237237
))}
238238
</div>
239239
<p className="flex items-center justify-center py-2 leading-5 text-center typography-text-sm text-white/50 font-body md:ml-6">
240-
@2023 Vue Storefront
240+
@2024 Alokai
241241
</p>
242242
</div>
243243
</footer>

‎apps/preview/next/tailwind.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
theme: {
1010
extend: {
1111
fontFamily: {
12-
sans: 'Red Hat Text, sans-serif',
12+
sans: 'Inter, sans-serif',
1313
},
1414
},
1515
},

‎apps/preview/nuxt/nuxt.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default defineNuxtConfig({
1111
htmlAttrs: {
1212
lang: 'en',
1313
},
14-
title: 'Vue Storefront UI v2',
14+
title: 'Alokai UI v2',
1515
},
1616
},
1717
alias: {

‎apps/preview/nuxt/pages/showcases/Footer/FooterBasic.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<p
6868
class="flex items-center justify-center py-2 leading-5 text-center typography-text-sm text-white/50 font-body md:ml-6"
6969
>
70-
@2023 Vue Storefront
70+
@2024 Alokai
7171
</p>
7272
</div>
7373
</footer>

‎apps/preview/nuxt/tailwind.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default <Config>{
99
theme: {
1010
extend: {
1111
fontFamily: {
12-
sans: 'Red Hat Text, sans-serif',
12+
sans: 'Inter, sans-serif',
1313
},
1414
},
1515
},

‎apps/test/react/tailwind.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = {
2727
theme: {
2828
extend: {
2929
fontFamily: {
30-
sans: 'Red Hat Text, sans-serif',
30+
sans: 'Inter, sans-serif',
3131
},
3232
},
3333
},

‎apps/test/vue/tailwind.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
theme: {
2929
extend: {
3030
fontFamily: {
31-
sans: "Red Hat Text, sans-serif",
31+
sans: "Inter, sans-serif",
3232
},
3333
},
3434
},

‎createIcons.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,11 @@ const camelize = s => s.replace(/-./g, x => x[1].toUpperCase());
125125
const capitalize = s => s && s[0].toUpperCase() + s.slice(1);
126126
const getSvg = async (svgName, doOptimiziation) => {
127127
const svgPath = path.join(inputDirectoryPath, svgName);
128-
let fileContent = await fsPromise.readFile(svgPath, 'utf8').catch(() => ({}));
128+
const fileContent = await fsPromise.readFile(svgPath, 'utf8').catch(() => ({}));
129+
let optimizedFileContent = fileContent;
129130
if (doOptimiziation) {
130131
try {
131-
fileContent = optimize(fileContent, {
132+
optimizedFileContent = optimize(optimizedFileContent, {
132133
multipass: true,
133134
svg2js: {
134135
pretty: true
@@ -151,7 +152,7 @@ const getSvg = async (svgName, doOptimiziation) => {
151152
return {
152153
fileName: camelize(fileName),
153154
name: fileName,
154-
content: fileContent.substring(fileContent.indexOf('>') + 1, fileContent.lastIndexOf('<')).replace(/"/g, "'"),
155+
content: optimizedFileContent.substring(optimizedFileContent.indexOf('>') + 1, optimizedFileContent.lastIndexOf('<')).replace(/"/g, "'"),
155156
attrs: {
156157
viewBox: /viewBox="([^"]+)"/.exec(fileContent)?.[1]
157158
},

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"yarn": ">=1.22.19",
8181
"node": ">=16.0.0 <17.0.0"
8282
},
83-
"packageManager": "yarn@3.6.3",
83+
"packageManager": "yarn@3.7.0",
8484
"config": {
8585
"commitizen": {
8686
"path": "cz-conventional-changelog",

‎packages/config/tailwind/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# @storefront-ui/tailwind-config
2+
3+
## 2.4.0
4+
5+
### Minor Changes
6+
7+
- [#3070](https://github.com/vuestorefront/storefront-ui/pull/3070) [`e15a3f6cb`](https://github.com/vuestorefront/storefront-ui/commit/e15a3f6cb56fd28b2e9a0bd525e9fcbde44d29f6) Thanks [@Szymon-dziewonski](https://github.com/Szymon-dziewonski)! - Change general rules for styling
8+
9+
### Patch Changes
10+
11+
- [#3073](https://github.com/vuestorefront/storefront-ui/pull/3073) [`a40579d26`](https://github.com/vuestorefront/storefront-ui/commit/a40579d26c2912c5d4d05e1a833801e3e87901b3) Thanks [@Szymon-dziewonski](https://github.com/Szymon-dziewonski)! - Change `Inter Display` into `Inter`

‎packages/config/tailwind/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 Vue Storefront
3+
Copyright (c) 2024 Alokai
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)