Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: css build, merge conflicts, clean up build
- Loading branch information
Showing
13 changed files
with
904 additions
and
885 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,73 @@ | ||
| @use './scss/fonts.scss'; | ||
| @use './scss/rodal.scss'; | ||
| @use './scss/modal.scss'; | ||
| @use './components/button.scss'; | ||
| @use './components/gallery/gallery.scss'; | ||
| @use './scss/rc-tooltip.scss'; | ||
| // @use './scss/fonts.scss'; | ||
| // @use './scss/rodal.scss'; | ||
| // @use './scss/modal.scss'; | ||
| // @use './components/button.scss'; | ||
| // @use './components/gallery/gallery.scss'; | ||
| // @use './scss/rc-tooltip.scss'; | ||
|
|
||
| :root { | ||
| --color-secondary: black; | ||
| --color-primary: white; | ||
| --base-padding: 8px; | ||
| --base-margin: 8px; | ||
| } | ||
| // :root { | ||
| // --color-secondary: black; | ||
| // --color-primary: white; | ||
| // --base-padding: 8px; | ||
| // --base-margin: 8px; | ||
| // } | ||
|
|
||
| // * { | ||
| // box-sizing: border-box; | ||
| // margin: 0; | ||
| // padding: 0; | ||
| // font-family: 'Inter', sans-serif; | ||
| // font-size: 16px; | ||
| // color: var(--color-secondary); | ||
| // } | ||
|
|
||
| * { | ||
| box-sizing: border-box; | ||
| margin: 0; | ||
| padding: 0; | ||
| font-family: 'Inter', sans-serif; | ||
| font-size: 16px; | ||
| color: var(--color-secondary); | ||
| } | ||
| // h1, | ||
| // h2, | ||
| // h3 { | ||
| // font-family: Ezra; | ||
| // font-weight: 500; | ||
| // } | ||
|
|
||
| h1, | ||
| h2, | ||
| h3 { | ||
| font-family: Ezra; | ||
| font-weight: 500; | ||
| } | ||
| // section { | ||
| // width: 100%; | ||
| // display: flex; | ||
| // flex-direction: row; | ||
| // align-items: start; | ||
| // flex-wrap: wrap; | ||
|
|
||
| section { | ||
| width: 100%; | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: start; | ||
| flex-wrap: wrap; | ||
| // justify-content: center; | ||
| // } | ||
| // code { | ||
| // color: black; | ||
| // } | ||
| // ul { | ||
| // width: 100%; | ||
| // margin: var(--base-margin); | ||
| // padding: var(--base-padding); | ||
| // display: flex; | ||
| // flex-direction: column; | ||
| // align-items: center; | ||
| // justify-content: center; | ||
| // ul { | ||
| // &:nth-child(3n) { | ||
| // flex-basis: 100%; | ||
| // } | ||
| // } | ||
|
|
||
| justify-content: center; | ||
| } | ||
| code { | ||
| color: black; | ||
| // h3 { | ||
| // text-decoration: underline; | ||
| // text-align: center; | ||
| // } | ||
| // list-style: none; | ||
| // border: 1px solid black; | ||
| // li { | ||
| // flex-wrap: wrap; | ||
| // padding: 4px; | ||
| // text-align: center; | ||
| // } | ||
| // } | ||
| .sme-class { | ||
| border: 2px solid red; | ||
| } | ||
| ul { | ||
| width: 100%; | ||
| margin: var(--base-margin); | ||
| padding: var(--base-padding); | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| ul { | ||
| &:nth-child(3n) { | ||
| flex-basis: 100%; | ||
| } | ||
| } | ||
|
|
||
| h3 { | ||
| text-decoration: underline; | ||
| text-align: center; | ||
| } | ||
| list-style: none; | ||
| border: 1px solid black; | ||
| li { | ||
| flex-wrap: wrap; | ||
| padding: 4px; | ||
| text-align: center; | ||
| } | ||
| } | ||
|
|
||
| @import '~@rainbow-me/rainbowkit/styles.css'; | ||
| @import '~react-phone-number-input/style.css'; | ||
| // @import '~@rainbow-me/rainbowkit/styles.css'; | ||
| // @import '~react-phone-number-input/style.css'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.