Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General changes to contact page #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

General changes to contact page #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
81 changes: 50 additions & 31 deletions contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@
<div class="row slider-text align-items-center justify-content-center">
<div class="col-lg-9 text-center col-sm-12 element-animate">
<h1 class="mb-4" style="text-align: center">Contact Us</h1>
<p class="custom-breadcrumbs"></p>
<p class="custom-breadcrumbs"><i></i></p>
<p class="custom-breadcrumbs">If you would like to work with us, be in a podcast, or join an event, please feel free to contact us!</p>
</div>
</div>
</div>
Expand All @@ -122,35 +121,46 @@ <h2 class="mb-4 section-title"><strong>Lorem ipsum dolor sit amet, consectetur a
<div class="container">

<div class="row">
<div class="col-lg-4">
<!--Left Column-->
<!-- Medium -->
<a href="https://medium.com/@ucbneurotech" class="contact-thumb" id="consultingTile">

<!-- ROW 1 -->
<div class="c-row">
<!-- LinkedIn -->
<a href="https://www.linkedin.com/company/neurotechberkeley/" class="contact-thumb" id="consultingTile">
<div class="work-text">
<h2>Medium</h2>
<p> medium.com/@ucbneurotech </p>
<h2>LinkedIn</h2>
<p></p>
</div>
<img src="images/contact_banners/medium.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/linkedin.jpg" alt="LinkedIn" class="img-fluid" width="540px" height="540px">
</a>
<!-- Facebook -->
<a href="https://www.facebook.com/neurotechberkeley/" class="contact-thumb" id="softwareTile">

<!-- E-mail -->
<a href="mailto:contact@neurotech.berkeley.edu" class="contact-thumb" id="outreachTile">
<div class="work-text">
<h2>Facebook</h2>
<p> facebook.com/neurotechberkeley </p>
<h2>E-mail</h2>
<p>contact@neurotech.berkeley.edu</p>
</div>
<img src="images/contact_banners/email.jpg" alt="E-mail" class="img-fluid" width="540px" height="540px">
</a>

<!-- Github -->
<a href="https://github.com/neurotech-berkeley" class="contact-thumb" id="educationTile">
<div class="work-text">
<h2>Github</h2>
<p>github.com/neurotech-berkeley</p>
</div>
<img src="images/contact_banners/facebook.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/github.jpg" alt="Github" class="img-fluid" width="540px" height="540px">
</a>
</div>

<div class="col-lg-4">
<!--Middle Column-->
<!-- Email -->
<a href="mailto:contact@neurotech.berkeley.edu" class="contact-thumb" id="outreachTile">
<!-- ROW 2 -->
<div class="c-row">
<!-- Medium -->
<a href="https://medium.com/@ucbneurotech" class="contact-thumb" id="consultingTile">
<div class="work-text">
<h2>E-mail</h2>
<p>contact@neurotech.berkeley.edu</p>
<h2>Medium</h2>
<p> medium.com/@ucbneurotech </p>
</div>
<img src="images/contact_banners/email.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/medium.jpg" alt="Medium" class="img-fluid" width="540px" height="540px">
</a>

<!-- Youtube -->
Expand All @@ -159,29 +169,38 @@ <h2>E-mail</h2>
<h2>Youtube</h2>
<p> </p>
</div>
<img src="images/contact_banners/youtube.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/youtube.jpg" alt="Youtube" class="img-fluid" width="540px" height="540px">
</a>

<!-- Instagram -->
<a href="https://www.instagram.com/calneurotech/" class="contact-thumb" id="consultingTile">
<div class="work-text">
<h2>Instagram</h2>
<p> instagram.com/calneurotech </p>
</div>
<img src="images/contact_banners/instagram.jpg" alt="Instagram" class="img-fluid" width="540px" height="540px">
</a>
</div>

<div class="col-lg-4">
<!--Right Column-->
<!-- Github -->
<a href="https://github.com/neurotech-berkeley" class="contact-thumb" id="educationTile">
<!-- ROW 3 -->
<div class="c-row">
<!-- Facebook -->
<a href="https://www.facebook.com/neurotechberkeley/" class="contact-thumb" id="softwareTile">
<div class="work-text">
<h2>Github</h2>
<p>github.com/neurotech-berkeley</p>
<h2>Facebook</h2>
<p> facebook.com/neurotechberkeley </p>
</div>
<img src="images/contact_banners/github.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/facebook.jpg" alt="Facebook" class="img-fluid" width="540px" height="540px">
</a>

<!-- Twitter -->
<a href="https://twitter.com/calneurotech" class="contact-thumb" id="publicationsTile">
<div class="work-text">
<h2>Twitter</h2>
<p>twitter.com/calneurotech</p>
</div>
<img src="images/contact_banners/twitter.jpg" alt="Image" class="img-fluid" width="540px" height="540px">
<img src="images/contact_banners/twitter.jpg" alt="Twitter" class="img-fluid" width="540px" height="540px">
</a>

</div>
</div>

Expand Down
93 changes: 92 additions & 1 deletion css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -11811,6 +11820,12 @@ figure figcaption {
height: 100%;
}

.row-t-4 {
display: inline-block;
width: 360px;
height: 300px;
}


/* .darken {
filter: brightness(50%);
Expand Down Expand Up @@ -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
}
Binary file modified images/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified images/contact_banners/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added images/contact_banners/instagram.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/contact_banners/linkedin.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/contact_banners/linkedin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.