diff --git a/.DS_Store b/.DS_Store index e7930dc..7868d37 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/contact.html b/contact.html index f7a9d6b..ef92d94 100644 --- a/contact.html +++ b/contact.html @@ -94,8 +94,7 @@

Contact Us

-

-

+

If you would like to work with us, be in a podcast, or join an event, please feel free to contact us!

@@ -122,35 +121,46 @@

Lorem ipsum dolor sit amet, consectetur a
-
- - - + + + - - diff --git a/css/style.css b/css/style.css index 9c75fe4..d2f5786 100644 --- a/css/style.css +++ b/css/style.css @@ -723,6 +723,12 @@ pre code { width: 360px; } +.c-row { + position: relative; + display: flex; + flex-direction: row; +} + .col { -ms-flex-preferred-size: 0; flex-basis: 0; @@ -11708,8 +11714,11 @@ figure figcaption { } .contact-thumb { - display: block; + display: inline; position: relative; + width: 360px; + margin-right: 15px; + margin-left: 15px; margin-bottom: 30px; } @@ -11811,6 +11820,12 @@ figure figcaption { height: 100%; } +.row-t-4 { + display: inline-block; + width: 360px; + height: 300px; +} + /* .darken { filter: brightness(50%); @@ -11877,4 +11892,80 @@ figure figcaption { #mind-container { padding: 0; } +<<<<<<< Updated upstream +======= +} + +.media-custom .media-body { + padding: 0 !important; +} + +.media-custom .media-body p, +h3 { + margin-bottom: 0 !important; +} + +.alumni { + padding: 30px !important; +} + +.alumni h3 { + font-size: 15px !important; +} + +.application-banner:before { + opacity: 0; +} + +.apply-here { + padding: 20px !important; +} + +header .navbar-brand { + letter-spacing: 0.1em !important; +} + +.row { + justify-content: space-evenly; +} + +#contents { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +#flyer { + margin-right: 100px; + width: 40%; + height: 100%; +} + +#events { + margin-left: 100px; + font-size: 20px; +} + +.section-title { + margin-bottom: 0 !important; +} + +@media (max-width: 991.98px) { + #flyer { + margin-right: 0 !important; + width: 100%; + height: 100%; + padding-bottom: 50px; + } + #events { + margin-left: 0 !important; + } + #contents { + flex-direction: column; + } + .alumni { + width: 33%; + padding: 10px !important; + } +>>>>>>> Stashed changes } \ No newline at end of file diff --git a/images/.DS_Store b/images/.DS_Store index f61b5fc..20f1189 100644 Binary files a/images/.DS_Store and b/images/.DS_Store differ diff --git a/images/contact_banners/.DS_Store b/images/contact_banners/.DS_Store index 1252531..fb5bd3b 100644 Binary files a/images/contact_banners/.DS_Store and b/images/contact_banners/.DS_Store differ diff --git a/images/contact_banners/instagram.jpg b/images/contact_banners/instagram.jpg new file mode 100644 index 0000000..1dd81a8 Binary files /dev/null and b/images/contact_banners/instagram.jpg differ diff --git a/images/contact_banners/linkedin.jpg b/images/contact_banners/linkedin.jpg new file mode 100644 index 0000000..b90d383 Binary files /dev/null and b/images/contact_banners/linkedin.jpg differ diff --git a/images/contact_banners/linkedin.png b/images/contact_banners/linkedin.png new file mode 100644 index 0000000..50aeee7 Binary files /dev/null and b/images/contact_banners/linkedin.png differ