-
Notifications
You must be signed in to change notification settings - Fork 191
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.
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
solving issue of different navbars #366
base: master
Are you sure you want to change the base?
Conversation
@harikesh409 Kindly merge my PR |
css/style.css
Outdated
@@ -406,6 +406,21 @@ hr { | |||
width: 90px; | |||
margin: auto; | |||
} | |||
.hr{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Few styles are conflicting with the hr
tag styles look into it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still present.
@harikesh409 I have solved all conflicts and issues please merge and add required levels |
/* Do an horizontal flip when you move the mouse over the flip box container */ | ||
.flip-card:hover .flip-card-inner { | ||
transform: rotateY(-180deg); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove empty line.
@harikesh409 Please check |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also update the navbar in DSA.html
and pracisedsa.html
.
There are too many unnecessary space changes and style ordering changes to compare kindly remove those.
Why were there many other changes which are not relevant to your issue?
} | ||
|
||
.skills-section th:hover { | ||
cursor: pointer; | ||
background-color: #27d8a3; | ||
background-color: #FFF; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these styles altered?
|
||
.skills-section tr:nth-child(odd) th { | ||
.skills-section tr:nth-child(odd) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these styles altered?
background-color: #49b1ad; | ||
} | ||
.skills-section tr:nth-child(odd) th:hover{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these styles removed?
} | ||
|
||
.fnq .card-header { | ||
box-shadow: 0px 10px 40px rgba(141, 139, 139, 0.4); | ||
box-shadow: 0px 10px 40px rgba(0,0,0,0.4); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is it altered?
team.html
Outdated
</li> | ||
|
||
<li class="nav-item dropdown"> | ||
<a class="nav-link font-weight-bold nav-items dropdown-toggle" href="#" id="navbarDropdown" | ||
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
More | ||
</a> | ||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict markers should be removed.
team.html
Outdated
<div class="dropdown-menu dropdown-menu-center" aria-labelledby="navbarDropdown"> | ||
>>>>>>> 953d461633973f2c0d46b219262d4c9e77bed7bf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict markers should be removed.
What is the progress @Muskan-creator ? |
I am working on it @harikesh409 |
@harikesh409 Please review |
|
Description
Please include a summary of the change and which issue is fixed.
Navbars in home and team section are different
Fixes #330
List any dependencies that are required for this change
Type of change
How Has This Been Tested?
UI /UX changes
Attach gif or screenshot for changes.
- After :
Checklist: