[pull] master from vuejs:master

src/.vuepress/components/guide/contributing/translations-data.js

@@ -17,6 +17,6 @@ export const repos = [
   { lang: 'ja', owner: 'vuejs-jp', repo: 'ja.vuejs.org', branch: 'lang-ja', url: 'https://v3.ja.vuejs.org/' },
   { lang: 'ko', owner: 'vuejs-kr', repo: 'docs-next', branch: 'rootKoKr', url: 'https://v3.ko.vuejs.org/'  },
   { lang: 'pt-br', owner: 'vuejs-br', repo: 'docs-next', branch: 'master', url: 'https://vuejsbr-docs-next.netlify.app/' },
-  { lang: 'ru', owner: 'translation-gang', repo: 'docs-next', branch: 'master' },
+  { lang: 'ru', owner: 'translation-gang', repo: 'docs-next', branch: 'master', url: 'https://v3.ru.vuejs.org/' },
   { lang: 'zh-cn', owner: 'vuejs', repo: 'docs-next-zh-cn', branch: 'master', url: 'https://v3.cn.vuejs.org/' }
 ]

src/.vuepress/config.js

@@ -6,7 +6,8 @@ const sidebar = {
       children: [
         '/cookbook/',
         '/cookbook/editable-svg-icons',
-        '/cookbook/debugging-in-vscode'
+        '/cookbook/debugging-in-vscode',
+        '/cookbook/automatic-global-registration-of-base-components'
       ]
     }
   ],
@@ -171,6 +172,7 @@ const sidebar = {
   ],
   migration: [
     '/guide/migration/introduction',
+    '/guide/migration/migration-build',
     {
       title: 'Details',
       collapsable: false,
@@ -201,6 +203,7 @@ const sidebar = {
         '/guide/migration/slots-unification',
         '/guide/migration/suspense',
         '/guide/migration/transition',
+        '/guide/migration/transition-as-root',
         '/guide/migration/transition-group',
         '/guide/migration/v-on-native-modifier-removed',
         '/guide/migration/v-model',
@@ -434,6 +437,10 @@ module.exports = {
             text: '日本語',
             link: 'https://v3.ja.vuejs.org/'
           },
+          {
+            text: 'Русский',
+            link: 'https://v3.ru.vuejs.org/'
+          },
           {
             text: 'More Translations',
             link: '/guide/contributing/translations#community-translations'
@@ -468,7 +475,8 @@ module.exports = {
       carbon: 'CEBDT27Y',
       custom: 'CKYD62QM',
       placement: 'vuejsorg'
-    }
+    },
+    topBanner: true
   },
   plugins: [
     [

src/.vuepress/theme/components/BannerTop.vue

@@ -0,0 +1,165 @@
+<template>
+  <a id="vs" href="https://vueschool.io/sales/summer-vue?friend=vuejs" target="_blank" rel="noreferrer">
+    <div class="vs-iso">
+      <img src="/images/vueschool/vs-iso.svg">
+    </div>
+    <div class="vs-logo">
+      <img src="/images/vueschool/vs-logo.svg">
+    </div>
+    <div class="vs-core">
+      <div class="vs-backpack">
+        <img src="/images/vueschool/vs-backpack.png" alt="Backpack">
+      </div>
+      <div class="vs-slogan">
+        3-months Vue School for only $49 <span style="text-decoration: line-through">$75</span>!
+        <span class="vs-slogan-light">
+          Limited Time Offer
+        </span>
+      </div>
+      <div class="vs-button">
+        GET ACCESS
+      </div>
+    </div>
+    <div
+      id="vs-close"
+      class="vs-close"
+      @click.stop.prevent="$emit('close')">
+      <img src="/images/vueschool/close.svg" alt="Close">
+    </div>
+  </a>
+</template>
+
+<style lang="stylus">
+@require '../styles/config'
+$topBannerHeight ?= 5rem
+$topBannerHeightMobile ?= 3.125rem
+
+// Banner
+#vs
+  align-items: center
+  background-color: #202A5A
+  box-sizing: border-box
+  color: #fff
+  display: none
+  font-family 'Inter', Roboto, Oxygen, Fira Sans, Helvetica Neue, sans-serif
+  justify-content: center
+  position: fixed
+  padding: 0 10px
+  left: 0
+  right: 0
+  top: 0
+  z-index: 100
+  height: $topBannerHeightMobile
+  @media (min-width: 680px)
+    height: $topBannerHeight
+  &:hover
+    .vs-core
+      .vs-button
+        background: #f22606
+
+  .vs-iso
+      display: none
+      position: absolute
+      left: 20px
+      height: 26px
+      img
+        height: 26px
+      @media (min-width: 680px)
+        display: inline-block
+        height: 40px
+        img
+          height: 40px
+      @media (min-width: 900px)
+        display: none
+
+  .vs-logo
+    position: absolute
+    display: none
+    left: 40px
+    @media (min-width: 900px)
+      display: block
+
+  .vs-core
+    display: flex
+    align-items: center
+
+    .vs-backpack
+      margin-right: 6px
+      @media (min-width: 680px)
+        margin-right: 14px
+      img
+        height: 50px
+        @media (min-width: 680px)
+          height: 74px
+
+    .vs-slogan
+      color: #FFF
+      font-weight: bold
+      font-size: 14px
+      margin-right: 26px
+      @media (min-width: 680px)
+        margin-right: 0
+        font-size: 18px
+      > .vs-slogan-light
+        color: #ff5338
+        display: block
+        text-align: left
+        @media (min-width: 900px)
+          text-align: center
+          display: inline
+
+    .vs-button
+      margin-left: 43px
+      color: #FFF
+      padding: 13px 24px
+      border-radius: 40px
+      display: none
+      background: #ff5338
+      font-weight: bold
+      @media (min-width: 680px)
+        display: inline-block
+
+  .vs-close
+      right: 10px
+      position: absolute
+      padding: 10px
+      @media (min-width: 680px)
+        right: 20px
+      &:hover
+        color: #56D8FF
+
+/************************************/
+
+// Show banner only if the container has class "has-top-banner"
+.theme-container.has-top-banner
+  #vs
+    display: flex
+
+// Add margin top to body, navbar and sidebar
+.theme-container.has-top-banner
+  margin-top: $topBannerHeightMobile
+  .navbar
+    margin-top: $topBannerHeightMobile
+  .sidebar
+    margin-top: $topBannerHeightMobile
+@media (min-width: 680px)
+  .theme-container.has-top-banner
+    margin-top: $topBannerHeight
+    .navbar
+      margin-top: $topBannerHeight
+    .sidebar
+      margin-top: $topBannerHeight
+
+// Adjust titles margin and padding for anchor links
+.theme-container.has-top-banner
+  {$contentClass}:not(.custom)
+    h1, h2, h3, h4, h5, h6
+      margin-top (0.5rem - $topBannerHeight - $navbarHeight)
+      padding-top ($navbarHeight + $topBannerHeight + 1rem)
+@media (min-width: 680px)
+  .theme-container.has-top-banner
+    {$contentClass}:not(.custom)
+      h1, h2, h3, h4, h5, h6
+        margin-top (0.5rem - $topBannerHeightMobile - $navbarHeight)
+        padding-top ($navbarHeight + $topBannerHeightMobile + 1rem)
+</style>

src/.vuepress/theme/layouts/Layout.vue

@@ -5,6 +5,8 @@
     @touchstart="onTouchStart"
     @touchend="onTouchEnd"
   >
+    <BannerTop v-if="showTopBanner" @close="closeBannerTop" />
+
     <Navbar v-if="shouldShowNavbar" @toggle-sidebar="toggleSidebar" />
 
     <div class="sidebar-mask" @click="toggleSidebar(false)" />
@@ -50,6 +52,7 @@ import Page from '@theme/components/Page.vue'
 import Sidebar from '@theme/components/Sidebar.vue'
 import BuySellAds from '@theme/components/BuySellAds.vue'
 import CarbonAds from '@theme/components/CarbonAds.vue'
+import BannerTop from '@theme/components/BannerTop.vue'
 import { resolveSidebarItems } from '../util'
 
 export default {
@@ -60,12 +63,14 @@ export default {
     Page,
     Sidebar,
     Navbar,
+    BannerTop,
     BuySellAds,
     CarbonAds
   },
 
   data() {
     return {
+      showTopBanner: false,
       isSidebarOpen: false
     }
   },
@@ -110,7 +115,8 @@ export default {
         {
           'no-navbar': !this.shouldShowNavbar,
           'sidebar-open': this.isSidebarOpen,
-          'no-sidebar': !this.shouldShowSidebar
+          'no-sidebar': !this.shouldShowSidebar,
+          'has-top-banner': this.showTopBanner
         },
         userPageClass
       ]
@@ -125,9 +131,16 @@ export default {
     this.$router.afterEach(() => {
       this.isSidebarOpen = false
     })
+
+    this.showTopBanner = !localStorage.getItem('VS_SUMMER_BANNER_CLOSED')
   },
 
   methods: {
+    closeBannerTop () {
+      this.showTopBanner = false
+      localStorage.setItem('VS_SUMMER_BANNER_CLOSED', 1)
+    },
+
     toggleSidebar(to) {
       this.isSidebarOpen = typeof to === 'boolean' ? to : !this.isSidebarOpen
       this.$emit('toggle-sidebar', this.isSidebarOpen)

src/.vuepress/theme/styles/index.styl

@@ -115,7 +115,7 @@ ul, ol
   padding-left 1.2em
 
 strong
-  font-weight 500
+  font-weight 600
 
 h1, h2, h3, h4, h5, h6
   font-weight 500