Skip to content

Commit

Permalink
small style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
katiecha committed Jan 14, 2025
1 parent 5639634 commit 62eebbc
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/pages/About.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

#history {
width: 80%;
margin-top: 1rem;
margin-top: 3rem;
text-align: center;
}

Expand Down
14 changes: 6 additions & 8 deletions src/pages/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,12 @@ export default function About() {
</div>
<div id="history">
<p font="font-family: Arial" style={{fontSize: "20px"}}>
<em>
"Founded in November 2018, CATCH works to provide adapted toys
to children with disabilities who are unable to play with most
commercially manufactured toys. Utilizing engineering,
creativity, and innovation, we give back to the community, while
also raising awareness about underrepresented communities and
their needs."
</em>
"Founded in November 2018, CATCH works to provide adapted toys
to children with disabilities who are unable to play with most
commercially manufactured toys. Utilizing engineering,
creativity, and innovation, we give back to the community, while
also raising awareness about underrepresented communities and
their needs."
</p>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/pages/Footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
bottom: 0%;
width: 100%;
margin-top: 100px;
margin-bottom: 100px;
height: 100%;
}

Expand All @@ -15,7 +14,7 @@
}

.footer-col {
margin: 0 5px;
margin: 0 100px;
flex: 1;
text-align: center;
}
Expand All @@ -30,7 +29,7 @@
}

.footer-heading {
margin-top: 25px;
margin-top: 50px;
font-weight: BOLD;
margin-bottom: 15px;
}
Expand Down
14 changes: 2 additions & 12 deletions src/pages/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,11 @@ export default function Footer() {
The Team
</a>
</div>
</div>
</div>
<div class="footer-col">
<div style={{ display: "inline-block", textAlign: "left" }}>
<div class="footer-heading">GET INVOLVED</div>
<div>
<a href="/toys" class="footer-row">
<a href="/toys" class="footer-row">
Tutorials
</a>
</div>
<div>
<a href="/toys" class="footer-row">
Partner Application
</a>
</div>
</div>
</div>
<div class="footer-col">
Expand Down Expand Up @@ -102,7 +92,7 @@ export default function Footer() {
</div>
<div>
<a href="https://cssgunc.org/" class="footer-row">
Site made by CS+SG at UNC!
Website made by CS + SG at UNC!
</a>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/pages/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ h2 {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
align-items: center
}

.carouselItem {
Expand All @@ -27,7 +27,7 @@ h2 {

.carouselItemWide {
width: 48%;
margin-bottom: 2rem;
margin-bottom: 3rem;
}

.landing {
Expand Down Expand Up @@ -107,6 +107,7 @@ button {
color: black;
background-color: transparent;
border: none;
margin-top: 50px;
}

#introduction,
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ function MainSlideshow() {
};

const mainSettings = {
dots: true,
dots: false,
infinite: true,
speed: 500,
slidesToShow: 3,
slidesToScroll: 1,
waitForAnimate: true,
nextArrow: <SampleNextArrow />,
prevArrow: <SamplePrevArrow />,
arrows: false
arrows: true
};

return (
Expand Down Expand Up @@ -172,7 +172,7 @@ function SamplePrevArrow(props) {
// WORKING WITH BACKEND START
export default function Home() {
const settings = {
dots: true,
dots: false,
fade: true,
infinite: true,
speed: 500,
Expand Down
12 changes: 7 additions & 5 deletions src/pages/Toys.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
border: none;
min-width: 35%;
width: 30%;
background-color: rgba(243, 111, 57, 0.5);
color: white;
background-color: rgba(243, 111, 57, 1);
font-weight: bold;
justify-content: center;
display: flex;
Expand Down Expand Up @@ -122,7 +123,7 @@
}

.add-to-cart-button:hover {
background-color: rgba(243, 111, 57, 1);
background-color: #5EBFB5;
color: white;
transform: scale(1.1);
}
Expand Down Expand Up @@ -176,8 +177,8 @@
position: absolute;
width: 30px;
height: 30px;
bottom: 2%;
right: 2%;
bottom: 5%;
right: 5%;
border-radius: 100%;
border: none;
background-color: rgb(243, 110, 57);
Expand All @@ -188,13 +189,14 @@
}

.plus-icon {
color: white;
display: flex;
align-items: center;
justify-content: center;
}

.plus-toy:hover {
background-color: rgba(243, 111, 57, 1);
background-color: rgba(94, 191, 181, 1);
color: white;
transform: scale(1.1); /* Increase size on hover */
}
Expand Down

0 comments on commit 62eebbc

Please # to comment.