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.

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

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

Conversation

Muskan-creator
Copy link
Contributor

@Muskan-creator Muskan-creator commented Apr 7, 2021

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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

How Has This Been Tested?

UI /UX changes

Attach gif or screenshot for changes.

  • Before :
    - After :
    image

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@Muskan-creator
Copy link
Contributor Author

@harikesh409 Kindly merge my PR

css/style.css Outdated Show resolved Hide resolved
css/style.css Outdated Show resolved Hide resolved
css/style.css Outdated
@@ -406,6 +406,21 @@ hr {
width: 90px;
margin: auto;
}
.hr{
Copy link
Collaborator

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.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still present.

@Muskan-creator
Copy link
Contributor Author

@harikesh409 I have solved all conflicts and issues please merge and add required levels

team.html Show resolved Hide resolved
/* Do an horizontal flip when you move the mouse over the flip box container */
.flip-card:hover .flip-card-inner {
transform: rotateY(-180deg);

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove empty line.

css/style.css Outdated Show resolved Hide resolved
css/style.css Outdated Show resolved Hide resolved
css/style.css Outdated Show resolved Hide resolved
@harikesh409 harikesh409 added enhancement New Feature GSSOC21 GSSoC'21 level2 Bug Fixing, small features labels Apr 24, 2021
@Muskan-creator
Copy link
Contributor Author

@harikesh409 Please check

Copy link
Collaborator

@harikesh409 harikesh409 left a 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?

css/style.css Show resolved Hide resolved
}

.skills-section th:hover {
cursor: pointer;
background-color: #27d8a3;
background-color: #FFF;
Copy link
Collaborator

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) {
Copy link
Collaborator

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{
Copy link
Collaborator

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);
Copy link
Collaborator

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
Copy link
Collaborator

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
Copy link
Collaborator

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.

@harikesh409
Copy link
Collaborator

What is the progress @Muskan-creator ?

@harikesh409 harikesh409 mentioned this pull request May 15, 2021
@Muskan-creator
Copy link
Contributor Author

What is the progress @Muskan-creator ?

I am working on it @harikesh409

@Muskan-creator
Copy link
Contributor Author

@harikesh409 Please review

@harikesh409
Copy link
Collaborator

@harikesh409 Please review

  • Resolve merge conflicts
  • Few comments are not addressed.
  • The style.css file has too many space differences which makes us impossible to review so remove all those changes.
  • In team.html page More is not having the underline whereas it is present on the home page.
  • The footer in booklist.html page is not in sync with the main repo, resync your fork.
  • In DSA.html and practicedsa.html the navbar is overlapped with the content.

image

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changes requested enhancement New Feature GSSOC21 GSSoC'21 level2 Bug Fixing, small features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

navbars are different
2 participants