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

Add glyphicons to tabs on notes page #2306

Closed
wants to merge 3 commits into from

Conversation

AndyCodez
Copy link
Contributor

@AndyCodez AndyCodez commented Feb 12, 2018

Fixes #2299

@PublicLabBot
Copy link

2 Messages
📖 @AndyCodez Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 This pull request doesn’t link to a issue number. Please refer to the issue it fixes (if any) in the body of your PR, in the format: Fixes #123.

Generated by 🚫 Danger

@AndyCodez AndyCodez changed the title Add glyphicons to tabs on notes page (#2299) Add glyphicons to tabs on notes page fixes #2299 Feb 12, 2018
@AndyCodez AndyCodez changed the title Add glyphicons to tabs on notes page fixes #2299 Add glyphicons to tabs on notes page Feb 12, 2018
Copy link
Member

@SidharthBansal SidharthBansal left a comment

Choose a reason for hiding this comment

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

Can you please remove the Gemfile.lock file ?

@SidharthBansal
Copy link
Member

Great work. It looks good to me. Can you add a snapshot of what you are getting on your localhost? It will be very helpful for quick merge

@AndyCodez
Copy link
Contributor Author

issue2299

I've made the suggested changes.

@SidharthBansal
Copy link
Member

You don't need to remove the content of gemfile.lock rather , you need to remove your version of gemfile from this PR. If you need help I am happy to help with git.

@AndyCodez
Copy link
Contributor Author

How do I go about that? I'll appreciate the help.

@ViditChitkara
Copy link
Member

Hi @AndyCodez , we need not remove the gemfile.lock file but just the changes related to it. A temporary fix is to copy the gemfile.lock of plots2/master and paste it in your project. When you push the changes, you should only see changes related to notes/index.html.erb on this pr.

@AndyCodez AndyCodez closed this Feb 13, 2018
@AndyCodez AndyCodez deleted the add-glyphicons branch February 13, 2018 14:05
@AndyCodez
Copy link
Contributor Author

@ViditChitkara thanks! I did a reset then made the changes without checking my version of the Gemfile.lock into this pr. I however couldn't push to this remote branch so I deleted it and pushed my local branch again. I made another pr here #2316
Sorry for the confusion, first-timer mistake.

@ViditChitkara
Copy link
Member

No problems!! The changes look fantastic though!!

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

Successfully merging this pull request may close these issues.

4 participants