search

mozilla / brackets

An open source code editor for the web, written in JavaScript, HTML and CSS.
http://brackets.io
MIT License
176 stars 278 forks source link

#2480 PDF viewer highlighted text color #895

Closed ppatel221 closed 6 years ago

ppatel221 commented 6 years ago

I've made the appropriate CSS changes in the viewer-overrides.css. Here is the snapshot of what it looks like. pdf_highlight_color

humphd commented 6 years ago

@ppatel221 this seems to have a lot of extra changes in it (mostly string changes) that mean you need to rebase. Can you try this please:

# start by updating your local `master` branch
git checkout master
# assuming your git remote for mozilla/brackets is called `upstream`
git pull upstream master
# now rebase this branch on the updated master
git checkout PDFchange
git rebase master
# if this produces errors you don't understand, roll it back with `git rebase --abort`
# otherwise, push it up to GitHub like this:
git push origin PDFchange --force

This should mean that all the extra changes you have in this commit get removed. If you have trouble getting this to work, let me know and I'll help you, and/or do it in class to show other students how to cope with this situation.

ppatel221 commented 6 years ago

When I run your git commands, It tells me that everything is up to date. I've committed the new CSS changes.