Skip to content

Commit

Permalink
Merge pull request #775 from aniketsinha2002/revert-774-main
Browse files Browse the repository at this point in the history
Revert "Resolved Conflicts - Updated Navbar view on contact and team section with redirect fixes on navbar"
  • Loading branch information
aniketsinha2002 authored Jan 15, 2024
2 parents 517641c + af00968 commit ecd85b2
Show file tree
Hide file tree
Showing 6 changed files with 1,083 additions and 1,381 deletions.
167 changes: 0 additions & 167 deletions Team/team.css
Original file line number Diff line number Diff line change
@@ -1,170 +1,3 @@
/*--------navbar------------*/

nav {
/*background: #071f30;*/
/*background: transparent;*/
width: 20vw;
height: 5rem;
position: fixed;
top: 0;
z-index: 11;
text-transform: uppercase;
margin-top: 30px;
background: #071f30;
box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.2);
}

nav li {
margin: -20px;
}

/* change navbar styles on scroll using javascript */
.window-scroll {
background: #071f30;
box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.2);
}

.navbar {
margin-top: 0;
width: 100% !important;
}

nav {
background: #071f30;
box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.2);
display: flex;
justify-content: space-between;
letter-spacing: 0.5px;
}

.active {
padding: 5px 10px;
border-radius: 20px;
background-color: #1b4462;
}

.nav__container {
position: relative;
height: 50%;
top: 10px;
margin-left: -210px;
}

.nav__container a h4 {
height: 100%;
display: flex;
padding-left: 300px;
margin-top: 10px;
align-items: center;
}

.logo {
max-height: 2;
max-width: 2;
}

nav button {
display: none;
}

.nav_menu_main {
position: relative;
top: 25%;
right: 20%;
}

.nav__menu {
display: flex;
align-items: center;
gap: 10%;
position: relative;
top: 0;
right: 0;
margin-left: 10%;
}

.nav__menu a {
font-size: 0.9rem;
transition: var(--transition);
}

.nav__menu li a {
display: inline-block;
margin: 10px 20px;
/* margin-left: -1px; */
}

.nav__menu a:hover {
color: #ff3c78;
}

.nav__menu a.signup {
display: inline-block;
width: 140px;
height: 50px;
line-height: 50px;
background-color: transparent;
color: aqua;
border: 2px solid rgba(255, 255, 255, 0.488);
text-align: center;
font-size: 0.9rem;
border-radius: 30px;
transition: var(--transition);
}

.nav__menu a.signup:hover {
background: transparent;
color: var(--color-white);
border-color: var(--color-white);
box-shadow: 5px 5px 5px orange;
}

.nav-animation {
position: relative;
}

.nav-animation::after {
content: "";
position: absolute;
width: 100%;
height: 0.12rem;
background: #ff3c78;
left: 0;
bottom: 0;
transform: scale(0, 1);
transform-origin: 0% 100%;
transition: transform 0.4s ease;
}

.nav-animation:hover::after {
transform: scale(1, 1);
}

.para1 {
margin-top: 1rem;
font-size: 1.5rem;
line-height: 95%;
letter-spacing: normal;
}

.landingpg {
height: 760px;
}

.grad1 .pge1 {
padding-top: 55px;
font-weight: 400;
font-size: 4rem;
line-height: 90%;
letter-spacing: -0.2rem;
}

.uli {
position: absolute;
top: 0;
right: 0;
}

/* Custom CSS to adjust the size of contributor cards */
.mb-6 {
width: 270px; /* Adjust the value as needed */
Expand Down
Loading

0 comments on commit ecd85b2

Please sign in to comment.