Merge remote-tracking branch 'origin/upstream'

.gitignore

@@ -15,7 +15,6 @@
 .Trashes
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
-.idea
 
 # Directories potentially created on remote AFP share
 .AppleDB

.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__ = 'vueconfus2024'
-  restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
+  // window.__VUE_BANNER_ID__ = ''
+  // restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
 })()

.vitepress/theme/components/Banner.vue

@@ -22,30 +22,16 @@ function dismiss() {
 
 <template>
   <div class="banner" v-if="open">
-    <p class="vt-banner-text">
-      <span class="vt-text-primary">VueConf US</span>
-      <span class="vt-tagline"> - Join the official Vue.js conference</span>
-      | May 15-17, 2024 <span class="vt-place"> - New Orleans, USA</span>
-      <a
-        target="_blank"
-        class="vt-primary-action"
-        href="https://vueconf.us?utm_source=vuejs&utm_content=top_banner"
-      >Register <span class="vt-time-now">Now</span></a
-      >
-    </p>
+    <a target="_blank"></a>
     <button @click="dismiss">
       <VTIconPlus class="close" />
     </button>
-    <p class="vt-banner-text vt-coupon">
-      <span class="vt-text-primary">Use code</span> VUEJSDOCS
-      <span class="vt-text-primary">to get $100 off!‎</span>
-    </p>
   </div>
 </template>
 
 <style>
 html:not(.banner-dismissed) {
-  --vt-banner-height: 60px;
+  --vt-banner-height: 30px;
 }
 </style>
 
@@ -64,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 {
@@ -82,7 +70,7 @@ button {
   position: absolute;
   right: 0;
   top: 0;
-  padding: 20px 10px;
+  padding: 5px;
 }
 
 .close {
@@ -91,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;
   }
-}
+} */
 </style>