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; +}