Merge remote-tracking branch 'origin/master'

# Conflicts: # tailwind.config.js
2024-03-10 13:00:54 +08:00 · 2024-03-10 13:00:54 +08:00 · 6f6c9f9476
commit 6f6c9f9476
parent d0fc2669ad 55cd8743c6
3 changed files with 1753 additions and 1 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/assert/main.css
+++ b/src/assert/main.css
@ -1,3 +1,3 @@
@tailwind base;
@tailwind components;
-@tailwind utilities;
+@tailwind utilities;
--- a/src/components/HomeComponents/NavBar.vue
+++ b/src/components/HomeComponents/NavBar.vue
@ -1,5 +1,6 @@
 <template>
  <nav class="text-base z-50 sticky top-0 bg-white border-gray-200">
+    <!-- <div class="text-sky-600">000</div> -->
    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
      <a class="flex items-center space-x-3 rtl:space-x-reverse" href="/src/js">
        <span class="self-center text-2xl font-semibold whitespace-nowrap">LOGO</span>