From f81294b953d669f573db65009f53e2e888d8b715 Mon Sep 17 00:00:00 2001 From: Mostafa Date: Sun, 5 Nov 2023 21:01:21 +0330 Subject: [PATCH] resolving conflicts (#48) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "Add Vue Toronto banner - schedule 2 (#2536)" (#2553) This reverts commit 71ecfd5fb8f1ac82c4d5ee4ef72f4685d119040e. * Remove the app constant name from the method name (#2523) * Remove the app variable name from the method name To be consitent with the rest of the guide, it should be displayed the method name (with the dot accessor) i.e.: https://vuejs.org/guide/essentials/application.html#mounting-the-app * remove app const name from method * Update rules-recommended.md (#2540) docs: add missing div to seperate bad and good examples * Update events.md - Diff between Options API and Composition API text (#2550) * Update events.md - Diff between Options API and Composition API text The emits support for object sintax for Options API text was displayed for both, Options and Composition API. * Update events.md - in span instead of repeat code in different divs * Update events.md - fix options-api class * Update src/guide/components/events.md Co-authored-by: Natalia Tepluhina --------- Co-authored-by: Natalia Tepluhina * Add missing ':' on duration property (#2556) * docs: consistent colons in input labels (#2557) * docs: consistent colons in input labels * Update colons everywhere * docs: use useByRole in example and fix typos (#2559) getByRole validates the role of an element, giving us an extra free assertion https://testing-library.com/docs/queries/about/#priority * chore(deps): bump @vue/theme from 2.2.4 to 2.2.5 (#2555) Bumps [@vue/theme](https://github.com/vuejs/theme) from 2.2.4 to 2.2.5. - [Commits](https://github.com/vuejs/theme/commits/v2.2.5) --- updated-dependencies: - dependency-name: "@vue/theme" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix `watch` examples (#2537) * Add note to `watch` examples * fix watch examples * fix: fixed disabling an input --------- Co-authored-by: NataliaTepluhina * imported and changed twitter icon to new logo (#2548) --------- Signed-off-by: dependabot[bot] Co-authored-by: Evan You Co-authored-by: Leo <3853621+leoelz@users.noreply.github.com> Co-authored-by: Jérémie LITZLER <2410556+JeremieLitzler@users.noreply.github.com> Co-authored-by: Natalia Tepluhina Co-authored-by: cabbageshop Co-authored-by: Andrew <44983823+andrewvasilchuk@users.noreply.github.com> Co-authored-by: Yakir Gottesman Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jun Shindo <46585162+jay-es@users.noreply.github.com> Co-authored-by: stevenks17 --- .../inlined-scripts/restorePreference.js | 4 +- .vitepress/theme/components/Banner.vue | 88 +++---------------- .vitepress/theme/index.ts | 4 +- pnpm-lock.yaml | 6 +- src/about/team/TeamMember.vue | 4 +- src/guide/best-practices/accessibility.md | 12 +-- src/guide/built-ins/transition.md | 2 +- src/guide/components/events.md | 2 +- src/guide/components/registration.md | 4 +- src/guide/essentials/watchers.md | 20 +++-- src/guide/scaling-up/testing.md | 32 +++---- src/style-guide/rules-recommended.md | 8 +- 12 files changed, 68 insertions(+), 118 deletions(-) diff --git a/.vitepress/inlined-scripts/restorePreference.js b/.vitepress/inlined-scripts/restorePreference.js index edefb7d0..5e18b50f 100644 --- a/.vitepress/inlined-scripts/restorePreference.js +++ b/.vitepress/inlined-scripts/restorePreference.js @@ -8,6 +8,6 @@ restore('vue-docs-prefer-composition', 'prefer-composition', true) restore('vue-docs-prefer-sfc', 'prefer-sfc', true) - window.__VUE_BANNER_ID__ = 'vt2023-2' - restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed') + // window.__VUE_BANNER_ID__ = '' + // restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed') })() diff --git a/.vitepress/theme/components/Banner.vue b/.vitepress/theme/components/Banner.vue index 57916750..6730fcd4 100644 --- a/.vitepress/theme/components/Banner.vue +++ b/.vitepress/theme/components/Banner.vue @@ -22,31 +22,16 @@ function dismiss() { @@ -65,10 +50,12 @@ html:not(.banner-dismissed) { font-weight: 600; color: #fff; background-color: var(--vt-c-green); - background: #11252b; - display: flex; - justify-content: center; - align-items: center; + background: linear-gradient( + 90deg, + rgba(66, 184, 131, 1) 0%, + rgba(39, 179, 137, 1) 19%, + rgba(100, 126, 255, 1) 100% + ); } .banner-dismissed .banner { @@ -83,7 +70,7 @@ button { position: absolute; right: 0; top: 0; - padding: 20px 10px; + padding: 5px; } .close { @@ -92,59 +79,10 @@ button { fill: #fff; transform: rotate(45deg); } - -.vt-banner-text { - color: #fff; - font-size: 16px; -} - -.vt-text-primary { - color: #75c05e; -} - -.vt-primary-action { - background: #75c05e; - color: #121c1a; - padding: 8px 15px; - border-radius: 5px; - font-size: 14px; - text-decoration: none; - margin: 0 20px; - font-weight: bold; -} -.vt-primary-action:hover { - text-decoration: none; - background: #5a9f45; -} - -@media (max-width: 1280px) { - .banner .vt-banner-text { - font-size: 14px; - } - .vt-tagline { - display: none; - } -} - -@media (max-width: 780px) { - .vt-tagline { - display: none; - } - .vt-coupon { - display: none; - } - .vt-primary-action { - margin: 0 10px; - padding: 7px 10px; - } - .vt-time-now { - display: none; - } -} - -@media (max-width: 560px) { - .vt-place { +/* +@media (max-width: 720px) { + a > span { display: none; } -} +} */ diff --git a/.vitepress/theme/index.ts b/.vitepress/theme/index.ts index 11dd6756..7084831a 100644 --- a/.vitepress/theme/index.ts +++ b/.vitepress/theme/index.ts @@ -9,14 +9,14 @@ import { } from './components/preferences' import SponsorsAside from './components/SponsorsAside.vue' import VueSchoolLink from './components/VueSchoolLink.vue' -import Banner from './components/Banner.vue' +// import Banner from './components/Banner.vue' // import TextAd from './components/TextAd.vue' export default Object.assign({}, VPTheme, { Layout: () => { // @ts-ignore return h(VPTheme.Layout, null, { - banner: () => h(Banner), + // banner: () => h(Banner), 'sidebar-top': () => h(PreferenceSwitch), 'aside-mid': () => h(SponsorsAside) }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 641f6d77..d21625ed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ dependencies: version: 1.5.0(vue@3.3.7) '@vue/theme': specifier: ^2.2.4 - version: 2.2.4(vitepress@1.0.0-beta.7)(vue@3.3.7) + version: 2.2.5(vitepress@1.0.0-beta.7)(vue@3.3.7) dynamics.js: specifier: ^1.1.5 version: 1.1.5 @@ -608,8 +608,8 @@ packages: resolution: {integrity: sha512-N/tbkINRUDExgcPTBvxNkvHGu504k8lzlNQRITVnm6YjOjwa4r0nnbd4Jb01sNpur5hAllyRJzSK5PvB9PPwRg==} dev: false - /@vue/theme@2.2.4(vitepress@1.0.0-beta.7)(vue@3.3.7): - resolution: {integrity: sha512-6zHZNdTTnZ2ZZzA18o9hg2oUhcGeZw3/Rzl83eKZI+0M9NApaPvLNDB/qEYJkwhkC/BueY8MoRX93LudgaNVbg==} + /@vue/theme@2.2.5(vitepress@1.0.0-beta.7)(vue@3.3.7): + resolution: {integrity: sha512-UUPD0XxlRa69Ytely8JEU/cu8Pae5f4UqZNIXANPN8KT6j/O23dCbOfp1cKlSn+Q/xXLYp0K+vRh4IqZjt/9BQ==} peerDependencies: vitepress: ^1.0.0-alpha.60 dependencies: diff --git a/src/about/team/TeamMember.vue b/src/about/team/TeamMember.vue index 94abde99..3926aac7 100644 --- a/src/about/team/TeamMember.vue +++ b/src/about/team/TeamMember.vue @@ -9,7 +9,7 @@ import { VTIconLink, VTIconLinkedIn, VTIconMapPin, - VTIconTwitter, + VTIconX, VTLink } from '@vue/theme' import type { Member } from './Member' @@ -146,7 +146,7 @@ const avatarUrl = computed(() => { :href="`https://twitter.com/${member.socials.twitter}`" :no-icon="true" > -