fix: import order of windicss

upupming · Nov 3, 2021 · a7adc41 · a7adc41
1 parent 7e383d3
commit a7adc41
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 89 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,3 +32,5 @@ jobs:
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: vue3-compact-template # The folder the action should deploy.
+          git-config-name: 'github-actions[bot]'
+          git-config-email: 'github-actions[bot]@users.noreply.github.com'
diff --git a/src/App.vue b/src/App.vue
@@ -48,61 +48,57 @@ import IconGitHub from '~icons/mdi/github'
 </template>
 
 <style lang="less">
-@layer base {
-  #app {
-    font-family: Avenir, Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
+#app {
+  font-family: Avenir, Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 
-  a {
-    text-decoration: none;
-    color: hsl(160deg 100% 37% / 100%);
-    transition: 0.4s;
-  }
+a {
+  text-decoration: none;
+  color: hsl(160deg 100% 37% / 100%);
+  transition: 0.4s;
+}
 
-  a:hover {
-    background-color: hsl(160deg 100% 37% / 20%);
-  }
+a:hover {
+  background-color: hsl(160deg 100% 37% / 20%);
+}
 
-  *,
-  *::before,
-  *::after {
-    box-sizing: border-box;
-    margin: 0;
-    position: relative;
-    font-weight: normal;
-  }
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+  margin: 0;
+  position: relative;
+  font-weight: normal;
+}
 
-  :root {
-    --color-border: rgb(60 60 60 / 12%);
-    --section-gap: 160px;
-  }
+:root {
+  --color-border: rgb(60 60 60 / 12%);
+  --section-gap: 160px;
 }
 
-@layer components {
-  .nav-item {
-    @apply py-1 px-2 hover:bg-[#42b983dd] bg-[#42b983ee] active:bg-[#42b983ff] text-white rounded;
-  }
+.nav-item {
+  @apply py-1 px-2 hover:bg-[#42b983dd] bg-[#42b983ee] active:bg-[#42b983ff] text-white rounded;
+}
 
-  .router-link-exact-active {
-    @apply font-bold;
-  }
+.router-link-exact-active {
+  @apply font-bold;
+}
 
-  .btn {
-    @apply px-4 py-1 rounded inline-block
-      bg-teal-600 text-white cursor-pointer
-      hover:bg-teal-700
-      disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50;
-  }
+.btn {
+  @apply px-4 py-1 rounded inline-block
+    bg-teal-600 text-white cursor-pointer
+    hover:bg-teal-700
+    disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50;
+}
 
-  .icon-btn {
-    @apply inline-block cursor-pointer select-none
-      opacity-75 transition duration-200 ease-in-out
-      hover:opacity-100 hover:text-teal-600;
+.icon-btn {
+  @apply inline-block cursor-pointer select-none
+    opacity-75 transition duration-200 ease-in-out
+    hover:opacity-100 hover:text-teal-600;
 
-    font-size: 0.9em;
-  }
+  font-size: 0.9em;
 }
 
 </style>
diff --git a/src/components/TemplateIntroduction.vue b/src/components/TemplateIntroduction.vue
@@ -95,26 +95,24 @@ const counter = useCounterStore()
   </div>
 </template>
 
-<style scoped>
-@layer base {
-  a {
-    color: #42b983;
-  }
+<style>
+a {
+  color: #42b983;
+}
 
-  label {
-    margin: 0 0.5em;
-    font-weight: bold;
-  }
+label {
+  margin: 0 0.5em;
+  font-weight: bold;
+}
 
-  code {
-    background-color: #eee;
-    padding: 2px 4px;
-    border-radius: 4px;
-    color: #304455;
-  }
+code {
+  background-color: #eee;
+  padding: 2px 4px;
+  border-radius: 4px;
+  color: #304455;
+}
 
-  p {
-    @apply my-4;
-  }
+p {
+  @apply my-4;
 }
 </style>
diff --git a/src/components/WelcomeItem.vue b/src/components/WelcomeItem.vue
@@ -12,27 +12,25 @@
   </div>
 </template>
 
-<style scoped>
-@layer base {
-  h3 {
-    font-size: 1.2rem;
-    font-weight: 500;
-    margin-bottom: 0.4rem;
-    color: #2c3e50;
-  }
+<style>
+h3 {
+  font-size: 1.2rem;
+  font-weight: 500;
+  margin-bottom: 0.4rem;
+  color: #2c3e50;
+}
 
-  i {
-    display: flex;
-    place-items: center;
-    place-content: center;
-    top: calc(50% - 25px);
-    left: -26px;
-    position: absolute;
-    border: 1px solid var(--color-border);
-    border-radius: 8px;
-    width: 50px;
-    height: 50px;
-  }
+i {
+  display: flex;
+  place-items: center;
+  place-content: center;
+  top: calc(50% - 25px);
+  left: -26px;
+  position: absolute;
+  border: 1px solid var(--color-border);
+  border-radius: 8px;
+  width: 50px;
+  height: 50px;
 }
 
 .item {

diff --git a/src/main.ts b/src/main.ts
@@ -1,9 +1,4 @@
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import { createRouter, createWebHashHistory } from 'vue-router'
-import App from './App.vue'
-import { routes } from './routes'
-
+// CSS must be imported before .vue files to ensure that the styles defined in .vue files cam overwrite the default base styles
 // windicss layers
 import 'virtual:windi-base.css'
 import 'virtual:windi-components.css'
@@ -14,6 +9,12 @@ import 'virtual:windi-utilities.css'
 // windicss devtools support (dev only)
 import 'virtual:windi-devtools'
 
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+import { createRouter, createWebHashHistory } from 'vue-router'
+import App from './App.vue'
+import { routes } from './routes'
+
 const router = createRouter({
   // 4. Provide the history implementation to use. We are using the hash history for simplicity here.
   history: createWebHashHistory(),