Skip to content

Commit 3f0f662

Browse files
committed
backmerged with develop
2 parents 39d84ac + 6e2e660 commit 3f0f662

1 file changed

Lines changed: 122 additions & 18 deletions

File tree

src/index.scss

Lines changed: 122 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
$desktop-width: 1100px;
44
$tablet-width: 720px;
55
$blue: #465491;
6-
$white: #FFFFFF;
76

87
/*
98
tablet & mobile have the column layout
@@ -98,7 +97,7 @@ a:hover{
9897

9998
body{
10099
margin: 0;
101-
font-family: Poppins;
100+
font-family: Poppins, sans-serif;
102101
}
103102

104103
html, body, #root, #app, .full-height{
@@ -273,6 +272,18 @@ html, body, #root, #app, .full-height{
273272
font-size: 3.25vw;
274273
font-weight: 500;
275274

275+
&::placeholder{ /* this refers to the input placeholder text (enter your email...)*/
276+
color: $blue;
277+
transition: color 0.4s;
278+
}
279+
&:focus::placeholder{
280+
color: transparent;
281+
}
282+
}
283+
.mailchimp-button{
284+
height: 30px;
285+
width: 30px;
286+
276287
@include tablet {
277288
height: 30px;
278289
font-size: 14px;
@@ -284,27 +295,120 @@ html, body, #root, #app, .full-height{
284295
border-width: 1px;
285296
border-color: $blue;
286297

287-
background-color: $white;
298+
background-color: white;
288299
background-image: url(./input-arrow.svg);
289300
background-repeat: no-repeat;
290301

291302
outline: none;
292303
transition: 0.1s; /* see: min-width: media query */
293-
294-
height: 9vw;
295-
width: 9vw;
296-
border-radius: 4.5vw;
297-
margin-right: 1.5vw;
298-
background-position: 1.5vw;
299-
background-size: 5vw;
304+
}
300305

301-
@include tablet {
302-
height: 30px;
303-
width: 30px;
304-
margin-right: 5px;
305-
border-radius: 15px;
306-
background-position: 3.75px;
307-
background-size: 18px;
306+
/*desktop only*/
307+
@media (min-width: 1100px){
308+
.desktop-hide{
309+
display: none;
310+
}
311+
/* arrow moves slightly to the right on hover */
312+
.mailchimp-button:hover{
313+
background-position: 5.25px;
314+
transition: 0.1s;
315+
}
316+
}
317+
318+
/*
319+
tablet & mobile have the column layout
320+
tablet has fixed widths and font sizes
321+
mobile has scaling widths and font sizes
322+
*/
323+
324+
/*non-desktop*/
325+
@media (max-width: 1100px){
326+
.mobile-hide{
327+
display: none;
328+
}
329+
#mlh-badge{
330+
height: 150px;
331+
margin-left: 40px;
332+
}
333+
334+
.navigation{
335+
font-size: 12px;
336+
font-weight: 400;
337+
338+
color: white;
339+
background-color: $blue;
340+
}
341+
.navigation ul li{
342+
padding: 25px 15px;
343+
}
344+
.navigation ul li a{
345+
color: white;
346+
border-bottom-style: solid;
347+
border-color: transparentize(white, 1);
348+
}
349+
.navigation ul li a:hover{
350+
border-color: transparentize(white, 1);
351+
}
352+
.navigation ul li a:active{
353+
border-color: transparentize(white, 0);
354+
}
355+
356+
.section{
357+
flex-direction: column;
358+
}
359+
}
360+
361+
/*mobile*/
362+
@media (max-width: 720px){
363+
.navigation{
364+
/*no scaling for very short devices,
365+
scaling matching the mlh badge scaling for avg devices,
366+
high scaling for very tall devices
367+
*/
368+
margin-bottom: unquote("max(0px, 10vh - 40px, 0px, 30vh - 190px)");
369+
}
370+
#mlh-badge{
371+
/*68 px is the current height of the nav bar
372+
will think of a better way to structure this later*/
373+
width: default;
374+
height: unquote("max(68px, 35px + 10vh)");
375+
margin-left: 15px;
376+
}
377+
378+
/*
379+
note: development on a mac may not have all font-weights,
380+
lines of text may be wider than they appear
381+
*/
382+
#hackathon-name{
383+
height: 14.1vw;
384+
font-size: 13vw;
385+
}
386+
#hackathon-description{
387+
height: 8.2vw;
388+
font-size: 6.3vw;
389+
}
390+
#hackathon-info{
391+
height: 4vw;
392+
font-size: 3.2vw;
393+
}
394+
395+
.hero-img{
396+
/* slightly smaller hero img for shorter screens */
397+
min-width: 80%;
398+
width: unquote("min(50vh, 90%)");
399+
}
400+
401+
.mailchimp-container{
402+
width: 80vw;
403+
404+
margin-top: 1vh;
405+
406+
height: 12vw;
407+
border-radius: 6vw;
408+
}
409+
.mailchimp-input{
410+
height: 7vw;
411+
font-size: 3.25vw;
308412
}
309413

310414
@include desktop {
@@ -318,4 +422,4 @@ html, body, #root, #app, .full-height{
318422

319423
::placeholder{ /* this refers to the input placeholder text (enter your email...)*/
320424
color: $blue;
321-
}
425+
}

0 commit comments

Comments
 (0)