fix: resolve conflict
This commit is contained in:
parent
5aa00bb148
commit
5ec0873695
7 changed files with 133 additions and 3 deletions
|
@ -56,7 +56,7 @@
|
|||
--sun: #ffa700;
|
||||
|
||||
/* fonts */
|
||||
--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif;
|
||||
--font-sans: "Poppins", -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif;
|
||||
--font-mono: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, ui-monospace, monospace;
|
||||
|
||||
/* text */
|
||||
|
@ -83,7 +83,6 @@
|
|||
|
||||
--font-weight-base: 400;
|
||||
--font-weight-bold: 700;
|
||||
--font-weight-heavy: 900;
|
||||
|
||||
/* spacing */
|
||||
--sizing-xs: .25rem;
|
||||
|
|
Reference in a new issue