From 7f26b46cde3f3e9ba6f3fb0cb4c0ca185bc7801c Mon Sep 17 00:00:00 2001
From: Miao_Spring <539943419@qq.com>
Date: Sat, 22 Mar 2025 14:56:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=94=B1naive-ui=E4=B8=8Etailwindcss=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/default.scss      | 90 +-----------------------------------
 src/styles/naive-ui-fix.scss |  4 ++
 2 files changed, 6 insertions(+), 88 deletions(-)
 create mode 100644 src/styles/naive-ui-fix.scss

diff --git a/src/styles/default.scss b/src/styles/default.scss
index 08ef6ae..db6b0b7 100644
--- a/src/styles/default.scss
+++ b/src/styles/default.scss
@@ -1,91 +1,5 @@
+@use './naive-ui-fix.scss';
+
 :root body {
    background-color: aliceblue;
 }
-// html,
-// body,
-// div,
-// span,
-// applet,
-// object,
-// iframe,
-// h1,
-// h2,
-// h3,
-// h4,
-// h5,
-// h6,
-// p,
-// blockquote,
-// pre,
-// a,
-// abbr,
-// acronym,
-// address,
-// big,
-// cite,
-// code,
-// del,
-// dfn,
-// em,
-// img,
-// ins,
-// kbd,
-// q,
-// s,
-// samp,
-// small,
-// strike,
-// strong,
-// sub,
-// sup,
-// tt,
-// var,
-// b,
-// u,
-// i,
-// center,
-// dl,
-// dt,
-// dd,
-// ol,
-// ul,
-// li,
-// fieldset,
-// form,
-// label,
-// legend,
-// table,
-// caption,
-// tbody,
-// tfoot,
-// thead,
-// tr,
-// th,
-// td,
-// article,
-// aside,
-// canvas,
-// details,
-// embed,
-// figure,
-// figcaption,
-// footer,
-// header,
-// hgroup,
-// menu,
-// nav,
-// output,
-// ruby,
-// section,
-// summary,
-// time,
-// mark,
-// audio,
-// video {
-//    margin: 0;
-//    padding: 0;
-//    border: 0;
-//    font-size: 100%;
-//    vertical-align: baseline;
-//    box-sizing: border-box;
-// }
diff --git a/src/styles/naive-ui-fix.scss b/src/styles/naive-ui-fix.scss
new file mode 100644
index 0000000..f46a49f
--- /dev/null
+++ b/src/styles/naive-ui-fix.scss
@@ -0,0 +1,4 @@
+// 修复naive-ui与tailwindcss冲突
+.n-qr-code {
+   box-sizing: content-box;
+}