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

Jump to bottom

Fixed conflicts #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed conflicts #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61f873e
Fixed conflicts
bsurmen Feb 26, 2020
4f1efd7
changes
bsurmen Feb 28, 2020
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
8 changes: 8 additions & 0 deletions home/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ console.log(members);


})
<<<<<<< HEAD
=======

console.log(socialLinks);


>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
let socialIconsVisibility = document.querySelectorAll("#memberInfoModal > div > div.social > a")

if (Auth.isLoggedIn == false) {
Expand Down Expand Up @@ -211,6 +214,7 @@ function configureNavButtons() {

const navMemberSelect = document.getElementById("type");
const beMemberDropdown = document.getElementsByClassName("beMember")[1];
const navMemberSelect = document.getElementById("type");

const urlParams = new URLSearchParams(window.location.search);
const memberType = urlParams.get('type');
Expand All @@ -219,7 +223,11 @@ function configureNavButtons() {
if (memberType == 'mentees') {
memberRef = db.collection("mentees");
pageTitle.innerText = "Mentees"
<<<<<<< HEAD
beMember.innerHTML = 'Be a Mentee'
=======
beMember[0].innerHTML = 'Be a Mentee'
>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
navMemberSelect.href = "index.html?type=mentors"
} else {
memberRef = db.collection("mentors");
Expand Down
16 changes: 16 additions & 0 deletions home/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ nav {
box-shadow: none;
}

<<<<<<< HEAD
nav ul a,.loginBtn {
=======

/* nav ul a {
>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
color: #f44336;
font-size: 15px;
} */
Expand Down Expand Up @@ -54,6 +58,12 @@ nav ul a,
font-weight: 500;
}

.loginBtn, .loginBtn:hover {
font-weight: 700;
border: 0;
background: transparent;
}

.modal-content ul li a {
color: white;
background-color: #f44336;
Expand Down Expand Up @@ -121,6 +131,11 @@ p.location {
}

@media only screen and (max-width: 600px) {
<<<<<<< HEAD
.valign-wrapper {
display: block;
}
=======
.valign-wrapper {
display: block;
}
Expand Down Expand Up @@ -159,4 +174,5 @@ p.location {
left: auto;
right: 60px;
/* margin-left: 40%; */
>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
}