Skip to content

Commit 942f2fb

Browse files
trumanjchantrumanjchan
authored
Merge pull request #180 from HackMerced/fix/correct_previousmerge
Fixed Past-Sponsors-Logos Component code messing with Home Page imgs
2 parents 8bfea80 + cb9b5b4 commit 942f2fb

File tree

3 files changed

+64
-91
lines changed

3 files changed

+64
-91
lines changed

‎src/pages/Home/styles.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,10 @@
315315
height: 850px;
316316
width: 450px;
317317
margin: -25% 0% 0% 7%;
318-
//margin-left: 7%;
318+
319319
@media (min-height: 800px) { //Changes the height of the tower
320320
height: calc(100vh + 40px);
321-
322321
}
323-
324322

325323
@media (max-width: 775px) {
326324
display: none;

‎src/pages/SponsorUs/index.tsx‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ const SponsorUs: FC = (): JSX.Element => {
2727
<Fragment>
2828
<Navbar />
2929
<main className="sponsors-us">
30-
{/* Information */}
30+
31+
{/* Sponsors Information */}
3132
<div className="sponsors-us__content">
3233
<div className="sponsors-us__content__heading">
3334
Become a sponsor to empower and help <br></br> grow the next generation of HackMerced.
@@ -60,33 +61,26 @@ const SponsorUs: FC = (): JSX.Element => {
6061
</p>
6162
</section>
6263
</div>
64+
6365
{/* Form to Submit a Request */}
6466
<Form formTitle="Sponsor Us" askCompany={true} formRequest="sponsor" />
67+
6568
{/* Past Sponsors Gallery */}
66-
{/* <section className="sponsors-us__past-sponsors">
67-
<h1 className="sponsors-us__past-sponsors__title">Past Sponsors</h1>
68-
<img
69-
src={PAST_SPONSORS}
70-
width="100%"
71-
alt="Past Hackathons Sponsors"
72-
className="sponsors-us__past-sponsors__img"
73-
/>
74-
</section> */}
75-
<div id="past-sponsors">
76-
Our Past Sponsors
77-
<ul className="listt">
78-
<li className="items"><img src={A} alt="ASUCM-Logo" /></li>
79-
<li className="items"><img src={B} alt="MLH-Logo" /></li>
80-
<li className="items"><img src={C} alt="1PASSWORD-Logo" /></li>
81-
<li className="items"><img src={D} alt="HACKMERCED-Logo" /></li>
82-
<li className="items"><img src={E} alt="ADOBE-Logo" /></li>
83-
<li className="items"><img src={F} alt="SKETCH-Logo" /></li>
84-
<li className="items"><img src={G} alt="CITRIS-Logo" /></li>
85-
<li className="items"><img src={H} alt="REPL-Logo" /></li>
86-
<li className="items"><img src={I} alt="ACM-Logo" /></li>
87-
<li className="items"><img src={J} alt="" /></li>
88-
<li className="items"><img src={K} alt="JETBRAINS-Logo" /></li>
89-
<li className="items"><img src={L} alt="SNORKEL-Logo" /></li>
69+
<div className="past-sponsors">
70+
<div>Our Past Sponsors</div>
71+
<ul className="list">
72+
<li className="items"><img className="logoimage" src={A} alt="ASUCM-Logo" /></li>
73+
<li className="items"><img className="logoimage" src={B} alt="MLH-Logo" /></li>
74+
<li className="items"><img className="logoimage" src={C} alt="1PASSWORD-Logo" /></li>
75+
<li className="items"><img className="logoimage" src={D} alt="HACKMERCED-Logo" /></li>
76+
<li className="items"><img className="logoimage" src={E} alt="ADOBE-Logo" /></li>
77+
<li className="items"><img className="logoimage" src={F} alt="SKETCH-Logo" /></li>
78+
<li className="items"><img className="logoimage" src={G} alt="CITRIS-Logo" /></li>
79+
<li className="items"><img className="logoimage" src={H} alt="REPL-Logo" /></li>
80+
<li className="items"><img className="logoimage" src={I} alt="ACM-Logo" /></li>
81+
<li className="items"><img className="logoimage" src={J} alt="" /></li>
82+
<li className="items"><img className="logoimage" src={K} alt="JETBRAINS-Logo" /></li>
83+
<li className="items"><img className="logoimage" src={L} alt="SNORKEL-Logo" /></li>
9084
</ul>
9185
</div>
9286
</main>

‎src/pages/SponsorUs/styles.scss‎

Lines changed: 44 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
justify-content: center;
44
padding-bottom: 2%;
55
background-color: var(--background);
6+
67
@media only screen and (max-width: 900px), only screen and (max-height: 640px) {
78
margin: 0 auto;
89
}
910
@media (max-width: 500px) {
1011
width: 90%;
1112
}
13+
1214
&__content {
1315
&__heading {
1416
font-size: 1.875rem;
@@ -56,85 +58,64 @@
5658
line-height: 30px;
5759
}
5860
}
61+
5962
@media only screen and (max-width: 900px),
6063
only screen and (max-height: 640px) {
6164
margin: 0;
6265
padding-top: 2rem;
6366
}
6467
}
65-
&__past-sponsors {
66-
display: block;
67-
display: flex;
68-
flex-direction: column;
69-
align-items: center;
70-
justify-content: center;
71-
text-align: center;
72-
background-color: var(--background);
73-
&__title {
74-
font-size: 1.875rem;
75-
line-height: 1.5em;
76-
text-align: center;
77-
margin: 2% auto auto auto;
78-
font-weight: bold;
79-
color: var(--text-color);
80-
text-align: center;
81-
@media (min-width: 768px) {
82-
font-size: 3rem;
83-
}
84-
}
85-
}
8668
}
8769

88-
img {
89-
height: 180px;
90-
width: 310px;
91-
}
9270

93-
#past-sponsors {
71+
.past-sponsors {
9472
font-weight: 500;
9573
font-size: 50px;
9674
text-align: center;
9775
color: black;
9876
margin: 2%;
99-
}
10077

101-
.listt {
102-
padding: 0;
103-
display: flex;
104-
flex-wrap: wrap;
105-
align-items: center;
106-
text-align: center;
107-
justify-content: space-evenly;
108-
list-style-type: none;
109-
margin: 20px 2% 0px 2%;
110-
}
78+
.list {
79+
padding: 0;
80+
display: flex;
81+
flex-wrap: wrap;
82+
align-items: center;
83+
text-align: center;
84+
justify-content: space-evenly;
85+
list-style-type: none;
86+
margin: 20px 2% 0px 2%;
11187

112-
.items {
113-
display: flex;
114-
border: 2px solid transparent;
115-
animation-name: animateIn;
116-
animation-duration: 350ms;
117-
animation-delay: 300ms;
118-
animation-fill-mode: both;
119-
animation-timing-function: ease-out-in;
120-
padding: 0px;
121-
text-align: center;
122-
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
123-
}
88+
.items {
89+
display: flex;
90+
border: 2px solid transparent;
91+
animation-name: animateIn;
92+
animation-duration: 350ms;
93+
animation-delay: 300ms;
94+
animation-fill-mode: both;
95+
animation-timing-function: ease-out-in;
96+
padding: 0px;
97+
text-align: center;
98+
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
12499

125-
@keyframes animateIn {
126-
0% {
127-
opacity: 0;
128-
transform: scale(0.6) translateY(8px) translateY(100px);
129-
}
130-
100% {
131-
opacity: 1;
100+
@keyframes animateIn {
101+
0% {
102+
opacity: 0;
103+
transform: scale(0.6) translateY(8px) translateY(100px);
104+
}
105+
100% {
106+
opacity: 1;
107+
}
108+
}
109+
110+
.logoimage {
111+
height: 180px;
112+
width: 310px;
113+
114+
@media only screen and (max-width: 400px) {
115+
height: 150px;
116+
width: 280px;
117+
}
118+
}
119+
}
132120
}
133121
}
134-
135-
@media screen and (max-width: 900px) {
136-
img {
137-
height: 125px;
138-
width: 200px;
139-
}
140-
}

0 commit comments

Comments
 (0)