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

style(code-editor): Matching-braces Style Changed #16398

Closed
wants to merge 1 commit into from

Conversation

vkWeb
Copy link
Member

@vkWeb vkWeb commented Jan 2, 2018

Pre-Submission Checklist

  • Your pull request targets the staging branch of freeCodeCamp.
  • Branch starts with either fix/, feature/, or translate/ (e.g. fix/signin-issue)
  • You have only one commit (if not, squash them into one commit).
  • All new and existing tests pass the command npm test. Use git commit --amend to amend any fixes.

Type of Change

  • Small bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Add new translation (feature adding new translations)

Checklist:

  • Tested changes locally.
    Reason: Code-mirror doesn't seem to work locally.
  • Addressed currently open issue (replace XXXXX with an issue no in next line)

Closes #16363

Description

Added a border around the pair of matching braces like in VSCode and also It's uniform with the night mode.

Default Setup:

After applying the changes:

@BerkeleyTrue BerkeleyTrue added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Jan 2, 2018
@camperbot
Copy link
Contributor

@vkWeb updated the pull request.

@camperbot
Copy link
Contributor

@vkWeb updated the pull request.

div.CodeMirror span.CodeMirror-matchingbracket {
border: 0.5px solid #939393 !important;
color: #000;

This comment was marked as off-topic.

This comment was marked as off-topic.

@Bouncey Bouncey added the status: waiting update To be applied to PR if a maintainer/reviewer has left a feedback and follow up is needed from OP label Jan 2, 2018
@raisedadead raisedadead added status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. and removed status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. labels Jan 11, 2018
@raisedadead
Copy link
Member

Hi @vkWeb would you need any help with this, there is a conflict that needs to be resolved, and the review comment to be addressed.

Let us know.

@vkWeb
Copy link
Member Author

vkWeb commented Jan 12, 2018

@raisedadead Yes, I need help with this merge conflict. How can I resolve this? And Yes, I'll make the requested changes. Actually, my local environment is down, it's showing that plugin not found I'll re-clone my fork and will install it all over again.
Sorry for the delay.

@raisedadead
Copy link
Member

You start with rebasing your branch, same as current staging. Follow the rebasing instructions in the docs, except use it on your pr branch.

When you get to the conflict, resolve them in your editor. Add your changes, make sure the old change is not overwritten by yours.

And push back on this PR branch git push --force.

However,
A simpler way would be close this PR and start fresh of staging, after you refresh your local, since you are cloning anyways again and you don't have much code change.

Reachout to the Contributors Chat room for help.

@vkWeb
Copy link
Member Author

vkWeb commented Jan 12, 2018

@raisedadead Thanks for the help - Okay, I'm closing this PR. I'll submit a new one within few days.

@vkWeb vkWeb closed this Jan 12, 2018
@BerkeleyTrue BerkeleyTrue removed the status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. label Jan 12, 2018
@vkWeb vkWeb deleted the fix/style-matching-braces branch January 12, 2018 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: waiting update To be applied to PR if a maintainer/reviewer has left a feedback and follow up is needed from OP
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants