From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 12 Jul 2022 10:16:18 +0000 (+0800)
Subject: refactor: move global styles to `main.css`; use only scoped styles in `App.vue`
X-Git-Tag: v3.2.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e08d04e562abc105a0445b442ccc3c12f850c4a1;p=thirdparty%2Fvuejs%2Fcreate-vue.git

refactor: move global styles to `main.css`; use only scoped styles in `App.vue`

- `base.css` contains CSS resets and variables
- `main.css` is the global styles of the app, to be imported by `main.js`
- `App.vue` only contains the styles for the root `App` component
---

diff --git a/template/base/src/assets/main.css b/template/base/src/assets/main.css
new file mode 100644
index 00000000..c133f915
--- /dev/null
+++ b/template/base/src/assets/main.css
@@ -0,0 +1,35 @@
+@import "./base.css";
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+
+  font-weight: normal;
+}
+
+a,
+.green {
+  text-decoration: none;
+  color: hsla(160, 100%, 37%, 1);
+  transition: 0.4s;
+}
+
+@media (hover: hover) {
+  a:hover {
+    background-color: hsla(160, 100%, 37%, 0.2);
+  }
+}
+
+@media (min-width: 1024px) {
+  body {
+    display: flex;
+    place-items: center;
+  }
+
+  #app {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    padding: 0 2rem;
+  }
+}
diff --git a/template/code/default/src/App.vue b/template/code/default/src/App.vue
index b0b6901b..633a5dfe 100644
--- a/template/code/default/src/App.vue
+++ b/template/code/default/src/App.vue
@@ -17,17 +17,7 @@ import TheWelcome from './components/TheWelcome.vue'
   </main>
 </template>
 
-<style>
-@import './assets/base.css';
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-
-  font-weight: normal;
-}
-
+<style scoped>
 header {
   line-height: 1.5;
 }
@@ -37,45 +27,21 @@ header {
   margin: 0 auto 2rem;
 }
 
-a,
-.green {
-  text-decoration: none;
-  color: hsla(160, 100%, 37%, 1);
-  transition: 0.4s;
-}
-
-@media (hover: hover) {
-  a:hover {
-    background-color: hsla(160, 100%, 37%, 0.2);
-  }
-}
-
 @media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: center;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-
   header {
     display: flex;
     place-items: center;
     padding-right: calc(var(--section-gap) / 2);
   }
 
+  .logo {
+    margin: 0 2rem 0 0;
+  }
+
   header .wrapper {
     display: flex;
     place-items: flex-start;
     flex-wrap: wrap;
   }
-
-  .logo {
-    margin: 0 2rem 0 0;
-  }
 }
 </style>
diff --git a/template/code/router/src/App.vue b/template/code/router/src/App.vue
index 460e5b29..3ebaac91 100644
--- a/template/code/router/src/App.vue
+++ b/template/code/router/src/App.vue
@@ -20,17 +20,7 @@ import HelloWorld from '@/components/HelloWorld.vue'
   <RouterView />
 </template>
 
-<style>
-@import '@/assets/base.css';
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-
-  font-weight: normal;
-}
-
+<style scoped>
 header {
   line-height: 1.5;
   max-height: 100vh;
@@ -41,19 +31,6 @@ header {
   margin: 0 auto 2rem;
 }
 
-a,
-.green {
-  text-decoration: none;
-  color: hsla(160, 100%, 37%, 1);
-  transition: 0.4s;
-}
-
-@media (hover: hover) {
-  a:hover {
-    background-color: hsla(160, 100%, 37%, 0.2);
-  }
-}
-
 nav {
   width: 100%;
   font-size: 12px;
@@ -80,33 +57,22 @@ nav a:first-of-type {
 }
 
 @media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: center;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-
   header {
     display: flex;
     place-items: center;
     padding-right: calc(var(--section-gap) / 2);
   }
 
+  .logo {
+    margin: 0 2rem 0 0;
+  }
+
   header .wrapper {
     display: flex;
     place-items: flex-start;
     flex-wrap: wrap;
   }
 
-  .logo {
-    margin: 0 2rem 0 0;
-  }
-
   nav {
     text-align: left;
     margin-left: -1rem;
diff --git a/template/code/typescript-default/src/App.vue b/template/code/typescript-default/src/App.vue
index d91eefc4..d05208d6 100644
--- a/template/code/typescript-default/src/App.vue
+++ b/template/code/typescript-default/src/App.vue
@@ -17,17 +17,7 @@ import TheWelcome from './components/TheWelcome.vue'
   </main>
 </template>
 
-<style>
-@import './assets/base.css';
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-
-  font-weight: normal;
-}
-
+<style scoped>
 header {
   line-height: 1.5;
 }
@@ -37,45 +27,21 @@ header {
   margin: 0 auto 2rem;
 }
 
-a,
-.green {
-  text-decoration: none;
-  color: hsla(160, 100%, 37%, 1);
-  transition: 0.4s;
-}
-
-@media (hover: hover) {
-  a:hover {
-    background-color: hsla(160, 100%, 37%, 0.2);
-  }
-}
-
 @media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: center;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-
   header {
     display: flex;
     place-items: center;
     padding-right: calc(var(--section-gap) / 2);
   }
 
+  .logo {
+    margin: 0 2rem 0 0;
+  }
+
   header .wrapper {
     display: flex;
     place-items: flex-start;
     flex-wrap: wrap;
   }
-
-  .logo {
-    margin: 0 2rem 0 0;
-  }
 }
 </style>
diff --git a/template/code/typescript-router/src/App.vue b/template/code/typescript-router/src/App.vue
index 7de68e9b..ebf59d59 100644
--- a/template/code/typescript-router/src/App.vue
+++ b/template/code/typescript-router/src/App.vue
@@ -20,17 +20,7 @@ import HelloWorld from '@/components/HelloWorld.vue'
   <RouterView />
 </template>
 
-<style>
-@import '@/assets/base.css';
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-
-  font-weight: normal;
-}
-
+<style scoped>
 header {
   line-height: 1.5;
   max-height: 100vh;
@@ -41,19 +31,6 @@ header {
   margin: 0 auto 2rem;
 }
 
-a,
-.green {
-  text-decoration: none;
-  color: hsla(160, 100%, 37%, 1);
-  transition: 0.4s;
-}
-
-@media (hover: hover) {
-  a:hover {
-    background-color: hsla(160, 100%, 37%, 0.2);
-  }
-}
-
 nav {
   width: 100%;
   font-size: 12px;
@@ -80,33 +57,22 @@ nav a:first-of-type {
 }
 
 @media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: center;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-
   header {
     display: flex;
     place-items: center;
     padding-right: calc(var(--section-gap) / 2);
   }
 
+  .logo {
+    margin: 0 2rem 0 0;
+  }
+
   header .wrapper {
     display: flex;
     place-items: flex-start;
     flex-wrap: wrap;
   }
 
-  .logo {
-    margin: 0 2rem 0 0;
-  }
-
   nav {
     text-align: left;
     margin-left: -1rem;
diff --git a/template/entry/default/src/main.js b/template/entry/default/src/main.js
index 01433bca..90e6400b 100644
--- a/template/entry/default/src/main.js
+++ b/template/entry/default/src/main.js
@@ -1,4 +1,6 @@
 import { createApp } from 'vue'
 import App from './App.vue'
 
+import './assets/main.css'
+
 createApp(App).mount('#app')
diff --git a/template/entry/pinia/src/main.js b/template/entry/pinia/src/main.js
index 5f77a891..8b9d201b 100644
--- a/template/entry/pinia/src/main.js
+++ b/template/entry/pinia/src/main.js
@@ -2,6 +2,8 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import App from './App.vue'
 
+import './assets/main.css'
+
 const app = createApp(App)
 
 app.use(createPinia())
diff --git a/template/entry/router-and-pinia/src/main.js b/template/entry/router-and-pinia/src/main.js
index fda1e6e3..4fb24b7e 100644
--- a/template/entry/router-and-pinia/src/main.js
+++ b/template/entry/router-and-pinia/src/main.js
@@ -4,6 +4,8 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 
+import './assets/main.css'
+
 const app = createApp(App)
 
 app.use(createPinia())
diff --git a/template/entry/router/src/main.js b/template/entry/router/src/main.js
index c8e37b03..eedade80 100644
--- a/template/entry/router/src/main.js
+++ b/template/entry/router/src/main.js
@@ -2,6 +2,8 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import router from './router'
 
+import './assets/main.css'
+
 const app = createApp(App)
 
 app.use(router)