Skip to content

Commit 079fa3c

Browse files
authored
Merge pull request #935 from codeRIT/develop
Push overlap of MLH banner fix to master
2 parents 7e35735 + 770959f commit 079fa3c

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

src/index.scss

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@100;200;300;400;500;600;700;800;900;1000&display=swap');
22

33
$blue: #465491;
4+
45
/*
56
tablet & mobile have the column layout
67
tablet has fixed widths and font sizes
@@ -21,6 +22,14 @@ $mobile-width: 720px;
2122
@media(max-width: #{$mobile-width}) { @content; }
2223
}
2324

25+
//override sass min() & max(), use css
26+
@function min($numbers...) {
27+
@return m#{i}n(#{$numbers});
28+
}
29+
@function max($numbers...) {
30+
@return m#{a}x(#{$numbers});
31+
}
32+
2433
a:hover {
2534
text-decoration: none;
2635
}
@@ -84,7 +93,7 @@ html, body, #root, #app, .full-height {
8493
/*68 px is the current height of the nav bar
8594
will think of a better way to structure this later*/
8695
width: default;
87-
height: unquote("max(68px, 35px + 10vh)");
96+
height: max(68px, calc(35px + 10vh));
8897
margin-left: 15px;
8998
}
9099
}
@@ -155,7 +164,8 @@ html, body, #root, #app, .full-height {
155164
scaling matching the mlh badge scaling for avg devices,
156165
high scaling for very tall devices
157166
*/
158-
margin-bottom: unquote("max(0px, 10vh - 40px, 0px, 30vh - 190px)");
167+
168+
margin-bottom: max(1px, calc(10vh - 40px), calc(30vh - 190px));
159169
}
160170
}
161171
.section {
@@ -184,7 +194,7 @@ html, body, #root, #app, .full-height {
184194
@include mobile {
185195
/* slightly smaller hero img for shorter screens */
186196
min-width: 80%;
187-
width: unquote("min(50vh, 90%)");
197+
width: min(50vh, 90%);
188198
}
189199
}
190200

0 commit comments

Comments
 (0)