Skip to content

Commit

Permalink
Merge pull request #66 from TABA-4th/dev
Browse files Browse the repository at this point in the history
merge dev branch
  • Loading branch information
kjungw1025 authored Dec 4, 2023
2 parents 2e39b9d + 9472229 commit 7727273
Show file tree
Hide file tree
Showing 7 changed files with 307 additions and 107 deletions.
161 changes: 87 additions & 74 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"sass-loader": "^13.3.2",
"slick-carousel": "^1.8.1",
"style-loader": "^3.3.3",
"styled-components": "^6.1.1",
"yup": "^1.3.2"
},
"scripts": {
Expand Down
Binary file added src/assets/img/spinner.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions src/components/Functions/FileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ const FileUpload = ({ label, onChange }) => {
};

const btnStyle = {
background:"#FFCAF8",
border:"1px solid #FFCAF8",
background:"#2ca8ff",
border:"1px solid #2ca8ff",
width:"400px",
height:"80px",
color: "white",
fontWeight:1000,
fontSize:"30px"
fontSize:"30px",
}




return (
Expand Down
Loading

0 comments on commit 7727273

Please sign in to comment.