From 8f8eae50c0b465a532fb4fee0f304badd6892d81 Mon Sep 17 00:00:00 2001 From: Levent Anil Ozen Date: Thu, 2 May 2024 15:24:47 +0300 Subject: [PATCH 1/2] docs: bump version in docs (#851) --- README.md | 4 ++-- docs/customizing-baklava-theme.stories.mdx | 6 +++--- docs/localization.stories.mdx | 2 +- docs/using-baklava-in-next.stories.mdx | 6 +++--- docs/using-baklava-in-react.stories.mdx | 8 ++++---- docs/using-baklava-in-vue.stories.mdx | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index adf6f1ed..768bd74b 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ Web implementation of the design system is created as native web components so i Preferred way of using Baklava is using it via CDN. Just import library JS and CSS files to your main document like below: ```html - - + + ``` This way library will be served from a very high performant CDN and all of the Baklava web components will be ready to use inside your web project. diff --git a/docs/customizing-baklava-theme.stories.mdx b/docs/customizing-baklava-theme.stories.mdx index a2d38da4..1ec6ad81 100644 --- a/docs/customizing-baklava-theme.stories.mdx +++ b/docs/customizing-baklava-theme.stories.mdx @@ -19,7 +19,7 @@ instead of `themes/default.css` file. Like: ```html - + ``` With this opportunity you can use all of the Baklava components with your own branding colors, own selection of Font or different sizing values. @@ -29,9 +29,9 @@ With this opportunity you can use all of the Baklava components with your own br If you want to change a small set of the design tokens, you may consider to extend default theme. ```html - + - + ``` With this, you can -for example- only override color palette for your app and continue to use typography or spacing rules from the default theme. diff --git a/docs/localization.stories.mdx b/docs/localization.stories.mdx index 82e0d25a..adea0732 100644 --- a/docs/localization.stories.mdx +++ b/docs/localization.stories.mdx @@ -10,7 +10,7 @@ To initialize localization, insert the following script at the head of your HTML ```html - + diff --git a/docs/using-baklava-in-next.stories.mdx b/docs/using-baklava-in-next.stories.mdx index f435bf1a..cba10f90 100644 --- a/docs/using-baklava-in-next.stories.mdx +++ b/docs/using-baklava-in-next.stories.mdx @@ -19,12 +19,12 @@ Include Baklava library from CDN to your project's `` section (in `layout. ```html + + ``` Then you can use Baklava React components in your project by importing them from `@trendyol/baklava/dist/baklava-react` in your code. @@ -62,7 +62,7 @@ import ReactDOM from "react-dom/client"; import "@trendyol/baklava"; import { setIconPath } from "@trendyol/baklava"; import "@trendyol/baklava/dist/themes/default.css"; -setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.0.0/dist/assets"); +setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets"); import App from "./App"; @@ -193,7 +193,7 @@ import "vitest-dom/extend-expect"; import "@trendyol/baklava"; import { setIconPath } from "@trendyol/baklava"; import "@trendyol/baklava/dist/themes/default.css"; -setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.0.0/dist/assets"); +setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets"); ``` We are ready to write tests. diff --git a/docs/using-baklava-in-vue.stories.mdx b/docs/using-baklava-in-vue.stories.mdx index 042c3bee..e9d30950 100644 --- a/docs/using-baklava-in-vue.stories.mdx +++ b/docs/using-baklava-in-vue.stories.mdx @@ -17,8 +17,8 @@ To make the rule more generic, easiest way is ignoring the elements start with ` To be able to use Baklava via CDN, you should add our default.css and baklava.js at head tag in your index.html file. ```html - - + + ``` ### Via NPM @@ -29,7 +29,7 @@ then, ```js @import "@trendyol/baklava/dist/themes/default.css"; import { setIconPath } from '@trendyol/baklava' -setIconPath('https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.0.0/dist/assets') +setIconPath('https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets') ``` #### Vue2 From fec9f28af412149b8ac26adef0fa11353d0279b1 Mon Sep 17 00:00:00 2001 From: Erbil Date: Thu, 10 Oct 2024 15:13:57 +0300 Subject: [PATCH 2/2] docs: resolve conflict in storybook (#928) Co-authored-by: Erbil Nas --- docs/using-baklava-in-react.stories.mdx | 4 ++-- docs/using-baklava-in-vue.stories.mdx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/using-baklava-in-react.stories.mdx b/docs/using-baklava-in-react.stories.mdx index 3b0b7066..d520fe6f 100644 --- a/docs/using-baklava-in-react.stories.mdx +++ b/docs/using-baklava-in-react.stories.mdx @@ -62,7 +62,7 @@ import ReactDOM from "react-dom/client"; import "@trendyol/baklava"; import { setIconPath } from "@trendyol/baklava"; import "@trendyol/baklava/dist/themes/default.css"; -setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets"); +setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava-icons@latest/icons"); import App from "./App"; @@ -193,7 +193,7 @@ import "vitest-dom/extend-expect"; import "@trendyol/baklava"; import { setIconPath } from "@trendyol/baklava"; import "@trendyol/baklava/dist/themes/default.css"; -setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets"); +setIconPath("https://cdn.jsdelivr.net/npm/@trendyol/baklava-icons@latest/icons"); ``` We are ready to write tests. diff --git a/docs/using-baklava-in-vue.stories.mdx b/docs/using-baklava-in-vue.stories.mdx index e9d30950..170ca641 100644 --- a/docs/using-baklava-in-vue.stories.mdx +++ b/docs/using-baklava-in-vue.stories.mdx @@ -29,7 +29,7 @@ then, ```js @import "@trendyol/baklava/dist/themes/default.css"; import { setIconPath } from '@trendyol/baklava' -setIconPath('https://cdn.jsdelivr.net/npm/@trendyol/baklava@3.1.0/dist/assets') +setIconPath('https://cdn.jsdelivr.net/npm/@trendyol/baklava-icons@latest/icons') ``` #### Vue2