Merge branch 'main' of https://github.com/vuejs/create-vue

haoqunjiang · haoqunjiang · commit e068c4752dc3 · 2021-12-27T10:56:05.000+08:00
diff --git a/playground/default/src/assets/base.css b/playground/default/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/jsx-pinia-with-tests/src/assets/base.css b/playground/jsx-pinia-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/jsx-pinia/src/assets/base.css b/playground/jsx-pinia/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/jsx-router-pinia-with-tests/src/components/HelloWorld.vue b/playground/jsx-router-pinia-with-tests/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/jsx-router-pinia/src/components/HelloWorld.vue b/playground/jsx-router-pinia/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/jsx-router-with-tests/src/components/HelloWorld.vue b/playground/jsx-router-with-tests/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/jsx-router/src/components/HelloWorld.vue b/playground/jsx-router/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/jsx-with-tests/src/assets/base.css b/playground/jsx-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/jsx/src/assets/base.css b/playground/jsx/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/pinia-with-tests/src/assets/base.css b/playground/pinia-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/pinia/src/assets/base.css b/playground/pinia/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/router-pinia-with-tests/src/components/HelloWorld.vue b/playground/router-pinia-with-tests/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/router-pinia/src/components/HelloWorld.vue b/playground/router-pinia/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/router-with-tests/src/components/HelloWorld.vue b/playground/router-with-tests/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/router/src/components/HelloWorld.vue b/playground/router/src/components/HelloWorld.vue
@@ -37,7 +37,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-pinia-with-tests/src/assets/base.css b/playground/typescript-jsx-pinia-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-jsx-pinia-with-tests/src/components/HelloWorld.vue b/playground/typescript-jsx-pinia-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-pinia/src/assets/base.css b/playground/typescript-jsx-pinia/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-jsx-pinia/src/components/HelloWorld.vue b/playground/typescript-jsx-pinia/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-router-pinia-with-tests/src/components/HelloWorld.vue b/playground/typescript-jsx-router-pinia-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-router-pinia/src/components/HelloWorld.vue b/playground/typescript-jsx-router-pinia/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-router-with-tests/src/components/HelloWorld.vue b/playground/typescript-jsx-router-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-router/src/components/HelloWorld.vue b/playground/typescript-jsx-router/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx-with-tests/src/assets/base.css b/playground/typescript-jsx-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-jsx-with-tests/src/components/HelloWorld.vue b/playground/typescript-jsx-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-jsx/src/assets/base.css b/playground/typescript-jsx/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-jsx/src/components/HelloWorld.vue b/playground/typescript-jsx/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-pinia-with-tests/src/assets/base.css b/playground/typescript-pinia-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-pinia-with-tests/src/components/HelloWorld.vue b/playground/typescript-pinia-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-pinia/src/assets/base.css b/playground/typescript-pinia/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-pinia/src/components/HelloWorld.vue b/playground/typescript-pinia/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-router-pinia-with-tests/src/components/HelloWorld.vue b/playground/typescript-router-pinia-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-router-pinia/src/components/HelloWorld.vue b/playground/typescript-router-pinia/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-router-with-tests/src/components/HelloWorld.vue b/playground/typescript-router-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-router/src/components/HelloWorld.vue b/playground/typescript-router/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript-with-tests/src/assets/base.css b/playground/typescript-with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript-with-tests/src/components/HelloWorld.vue b/playground/typescript-with-tests/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/typescript/src/assets/base.css b/playground/typescript/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);
diff --git a/playground/typescript/src/components/HelloWorld.vue b/playground/typescript/src/components/HelloWorld.vue
@@ -34,7 +34,6 @@ h3 {
 @media (min-width: 1024px) {
   .greetings h1,
   .greetings h3 {
-    display: block;
     text-align: left;
   }
 }
diff --git a/playground/with-tests/src/assets/base.css b/playground/with-tests/src/assets/base.css
@@ -12,7 +12,7 @@
 
   --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
   --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dadarkrk-1: rgba(84, 84, 84, 0.65);
+  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
   --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
 
   --vt-c-text-light-1: var(--vt-c-indigo);

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ h3 {`
`37`	`37`	`@media (min-width: 1024px) {`
`38`	`38`	`.greetings h1,`
`39`	`39`	`.greetings h3 {`
`40`		`- display: block;`
`41`	`40`	`text-align: left;`
`42`	`41`	`}`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ h3 {`
`34`	`34`	`@media (min-width: 1024px) {`
`35`	`35`	`.greetings h1,`
`36`	`36`	`.greetings h3 {`
`37`		`- display: block;`
`38`	`37`	`text-align: left;`
`39`	`38`	`}`
`40`	`39`	`}`