Skip to content
This repository has been archived by the owner on Oct 28, 2022. It is now read-only.

fixed css #145

Merged
merged 2 commits into from Oct 21, 2022
Merged

fixed css #145

merged 2 commits into from Oct 21, 2022

Conversation

ujen5173
Copy link
Contributor

No description provided.

Copy link
Owner

@shankarlohar shankarlohar left a comment

Choose a reason for hiding this comment

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

Hey, fix the merge Conflicts and show me what you changed. 😊 Let me know if you need any help

@shankarlohar shankarlohar added the hacktoberfest-accepted For Hacktoberfest label Oct 21, 2022
@shankarlohar shankarlohar merged commit 2ffcbf4 into shankarlohar:main Oct 21, 2022
@shankarlohar shankarlohar mentioned this pull request Oct 21, 2022
@shankarlohar
Copy link
Owner

Redo it whatever you did broke the page. Sorry. And give me conflict free code. and don't change 2000-3000 lines at once its hard to monitor.
Please give me screenshots of before and after your patch.

@ujen5173
Copy link
Contributor Author

@shankarlohar, Ohh Sorry for the conflict. This was my first pull request so I was confused about what to do. That change was because of a prettier extension. The code was not formatted and there were many HTML tag errors. I have fixed the HTML tag errors. Can you guide me on what to do now?

These are the changes I made:

/* Scroll-bar Customization */
body::-webkit-scrollbar {
  width: 17px;
}
body::-webkit-scrollbar-thumb {
  background: rgba(0, 0, 0, 0.6);
  border: 4px solid white;
  border-radius: 10px;
}
body::-webkit-scrollbar-thumb:hover {
  background: rgba(0, 0, 0, 0.4);
}
.sidebar::-webkit-scrollbar {
  width: 10px;
  background-color: transparent;
}

.sidebar::-webkit-scrollbar-thumb {
  border-radius: 15px;
}

.sidebar:hover::-webkit-scrollbar-thumb {
  /* width: 5px; */
  background-color: rgba(0, 0, 0, 0.2);
}

@shankarlohar
Copy link
Owner

@shankarlohar, Ohh Sorry for the conflict. This was my first pull request so I was confused about what to do. That change was because of a prettier extension. The code was not formatted and there were many HTML tag errors. I have fixed the HTML tag errors. Can you guide me on what to do now?

These are the changes I made:

/* Scroll-bar Customization */
body::-webkit-scrollbar {
  width: 17px;
}
body::-webkit-scrollbar-thumb {
  background: rgba(0, 0, 0, 0.6);
  border: 4px solid white;
  border-radius: 10px;
}
body::-webkit-scrollbar-thumb:hover {
  background: rgba(0, 0, 0, 0.4);
}
.sidebar::-webkit-scrollbar {
  width: 10px;
  background-color: transparent;
}

.sidebar::-webkit-scrollbar-thumb {
  border-radius: 15px;
}

.sidebar:hover::-webkit-scrollbar-thumb {
  /* width: 5px; */
  background-color: rgba(0, 0, 0, 0.2);
}

You can ask as many question you want let do it this way first.

Try adding your code with these steps:

  • First of all pull the recent changes from the repository as there are people giving pull requests every 10 min.
  • Now only add/change the line of code you want to in the css file.
  • Run the change on your local server (if using vscode then use liveserver extension ) now if you see the changes you made is working fine on the website. then
  • run a pull command again to see if there are changes again.
    If there are no changes push the code and give me a pull request. If there are changes then pull them and resolve the conflicts (these are just your code overlapping with someone else) wherever needed. and then commit - push and send pull request to me.

PS: Take Screenshots from your liveserver of the change and add it to the pull request to show me what you changed visually so that I get a little help while reading your changes.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hacktoberfest-accepted For Hacktoberfest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants