Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

adjusting color and size settings in UI #121

Closed
wants to merge 1 commit into from

Conversation

bradleyrichter
Copy link
Contributor

@bbondy Included in this branch are color and size/margin changes for:

  • brave button
  • tab set back/forward buttons
  • title bar font size
  • tab font size
  • tab favicon alignment
  • tab string margins

intentUrl: (userId) => `${vaultHost}/v1/users/${userId}/intents`,
replacementUrl: adHost
}
}
Copy link
Member

Choose a reason for hiding this comment

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

We can't remove this config.js file because it's used at various parts in the code.
I think you want to:

git checkout HEAD^ -- js/constants/config.js
git checkout HEAD^ -- .gitignore
git commit --amend
git push

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so the ignore command didn't work and it appeared as a removal?

Copy link
Member

Choose a reason for hiding this comment

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

.gitignore is a file which lists parts of files you want git to ignore completely for further changes.
So it would mean you don't want any changes in the path js/constants/config.js to be tracked at all.

So you don't want to modify .gitignore at all, what I gave above changes that back.
You just wanted to get rid of your local changes I think.
Instead as changed it removes the file js/constants/config.js completely from source and ensures that no file ever added there will be tracked by source control.

Copy link
Member

Choose a reason for hiding this comment

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

So js/constants/config.js shouldn't show up in your diff at all.

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

Successfully merging this pull request may close these issues.

2 participants