From c66267e02eb35bc13408b43297c9d301f92a512b Mon Sep 17 00:00:00 2001 From: Evan You Date: Fri, 6 Dec 2024 10:16:54 +0800 Subject: [PATCH 01/11] Revert "add vuemastery banner black friday 2024 (#3104)" This reverts commit ab958c8e0d26ee8abae55357d46b1a4e06d01c6a. --- .../theme/components/VueMasteryBanner.vue | 253 ------------------ .vitepress/theme/index.ts | 2 - .../background-bubbles-vuemastery.svg | 110 -------- src/public/vuemastery/vuemastery-white.svg | 32 --- 4 files changed, 397 deletions(-) delete mode 100644 .vitepress/theme/components/VueMasteryBanner.vue delete mode 100644 src/public/vuemastery/background-bubbles-vuemastery.svg delete mode 100644 src/public/vuemastery/vuemastery-white.svg diff --git a/.vitepress/theme/components/VueMasteryBanner.vue b/.vitepress/theme/components/VueMasteryBanner.vue deleted file mode 100644 index 0b42c4e69..000000000 --- a/.vitepress/theme/components/VueMasteryBanner.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - diff --git a/.vitepress/theme/index.ts b/.vitepress/theme/index.ts index 212b41382..3aa1dac27 100644 --- a/.vitepress/theme/index.ts +++ b/.vitepress/theme/index.ts @@ -12,14 +12,12 @@ import SponsorsAside from './components/SponsorsAside.vue' import VueSchoolLink from './components/VueSchoolLink.vue' // import Banner from './components/Banner.vue' // import TextAd from './components/TextAd.vue' -import VueMasteryBanner from './components/VueMasteryBanner.vue' export default Object.assign({}, VPTheme, { Layout: () => { // @ts-ignore return h(VPTheme.Layout, null, { // banner: () => h(Banner), - banner: () => h(VueMasteryBanner), 'sidebar-top': () => h(PreferenceSwitch), 'sidebar-bottom': () => h(SecurityUpdateBtn), 'aside-mid': () => h(SponsorsAside) diff --git a/src/public/vuemastery/background-bubbles-vuemastery.svg b/src/public/vuemastery/background-bubbles-vuemastery.svg deleted file mode 100644 index 886d9e89b..000000000 --- a/src/public/vuemastery/background-bubbles-vuemastery.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/public/vuemastery/vuemastery-white.svg b/src/public/vuemastery/vuemastery-white.svg deleted file mode 100644 index bf97acdeb..000000000 --- a/src/public/vuemastery/vuemastery-white.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e63d3eabbba6052a1a3e8bc72322d8a9bd0435ab Mon Sep 17 00:00:00 2001 From: Jinjiang Date: Sun, 8 Dec 2024 18:57:44 +0800 Subject: [PATCH 02/11] Hide all style guide links and add outdated warnings on style guide pages (#3119) * docs: hide all the style-guide links until it's ready * docs: add outdated warnings on style guide pages * docs: adjust v-for with v-if warnings * docs: add outdated warning to style-guide index --- src/guide/essentials/conditional.md | 6 +++--- src/guide/essentials/list.md | 16 +++++++++++----- src/style-guide/index.md | 4 ++++ src/style-guide/rules-essential.md | 4 ++++ src/style-guide/rules-recommended.md | 4 ++++ src/style-guide/rules-strongly-recommended.md | 4 ++++ src/style-guide/rules-use-with-caution.md | 4 ++++ 7 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/guide/essentials/conditional.md b/src/guide/essentials/conditional.md index e33ac4d27..a1b507a6a 100644 --- a/src/guide/essentials/conditional.md +++ b/src/guide/essentials/conditional.md @@ -110,8 +110,8 @@ Generally speaking, `v-if` has higher toggle costs while `v-show` has higher ini ## `v-if` with `v-for` {#v-if-with-v-for} +When `v-if` and `v-for` are both used on the same element, `v-if` will be evaluated first. See the [list rendering guide](list#v-for-with-v-if) for details. + ::: warning Note -It's **not** recommended to use `v-if` and `v-for` on the same element due to implicit precedence. Refer to [style guide](/style-guide/rules-essential#avoid-v-if-with-v-for) for details. +It's **not** recommended to use `v-if` and `v-for` on the same element due to implicit precedence. Refer to [list rendering guide](list#v-for-with-v-if) for details. ::: - -When `v-if` and `v-for` are both used on the same element, `v-if` will be evaluated first. See the [list rendering guide](list#v-for-with-v-if) for details. diff --git a/src/guide/essentials/list.md b/src/guide/essentials/list.md index 2f7943c86..9451e41ba 100644 --- a/src/guide/essentials/list.md +++ b/src/guide/essentials/list.md @@ -223,10 +223,6 @@ Similar to template `v-if`, you can also use a `