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

Updated website #54

Merged
merged 7 commits into from
Aug 28, 2015
Merged

Updated website #54

merged 7 commits into from
Aug 28, 2015

Conversation

codewithtyler
Copy link
Contributor

This PR fixes #29, and #39 by adding a live demo to the website. In order to do this I made the Jekyll template Bootstrap 3 compatible. I migrated all dependencies over to CDN except for jQuery.hotkeys. Since jQuery.hotkeys does not have a CDN I added it using bower so that it does not have to be managed manually.

Finally, I have updated the website so that the basic usage now contains all the information on the Mindmup website. This way all the information is contained on one page and doesn't have to point to the Mindmup website other than to show that this repo was originally made by them.

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
<script src="bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
Copy link
Owner

Choose a reason for hiding this comment

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

We can probably use the CDN version of this too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I looked for an offical CDN but didn't find one. Do you know of one that I don't?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@steveathon I'm in the process of submitting a PR to the cdnjs.com repo containing the jQuery.hotkeys library. As soon as I get it done and it's approved I'll update my code to use the CDN link and I'll remove Bower while I'm at it.

@steveathon
Copy link
Owner

This is good to go. I've merged it in. Thanks for the great work on this @RandomlyKnighted

steveathon added a commit that referenced this pull request Aug 28, 2015
Added bower.json file
Fixes #29 and #39 by adding a live demo to the website
Removed bower since we use CDN for links
Switched Google Code Prettify to CDN
Migrated jquery.hotkeys from manual management to management using bower
Changed folder structure and updated bootstrap-wysiwyg to newly released
Updated basic usage section and included syntax highlighting
@steveathon steveathon merged commit b93774f into steveathon:gh-pages Aug 28, 2015
@codewithtyler codewithtyler mentioned this pull request Aug 28, 2015
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.

2 participants