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

use highlightjs #254

Merged
merged 1 commit into from
Jun 13, 2016
Merged

use highlightjs #254

merged 1 commit into from
Jun 13, 2016

Conversation

wilzbach
Copy link
Member

follow-up to #253

compare

image

with:

image

have a look at e.g. immutable

I realized that highlightjs doesn't recognize attributes correctly, e.g.

hightlight.js:
image

codemirror:

image

so probably that's only an intermediate step. Is there a way to use the CodeMirror highlighter for normal pre elements`

@wilzbach wilzbach force-pushed the use_highlighter branch 3 times, most recently from 69231c2 to 5bd5865 Compare June 12, 2016 13:53
@wilzbach
Copy link
Member Author

Wow apparently it's very easy to use CodeMirror to highlight the existing pre blocks.

Screenshots are done without #253.

image

image

@wilzbach wilzbach mentioned this pull request Jun 12, 2016
@@ -106,12 +106,22 @@ dlangTourApp.controller('DlangTourAppCtrl', [ '$scope', '$http', 'hotkeys', func
hotkeys.add({
combo: 'left',
description: 'Go to previous section',
callback: prevPage
callback: function() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

That doesn't look right. There was a PR which introduced those methods and now they are removed?

@wilzbach wilzbach force-pushed the use_highlighter branch 4 times, most recently from 8eca688 to 6dacae1 Compare June 13, 2016 13:01
@wilzbach
Copy link
Member Author

That doesn't look right. There was a PR which introduced those methods and now they are removed?

The other PR just wasn't part of this one - I don't know why git's suggested auto-merge suggested that, but a simple rebase solved the problem.

@stonemaster
Copy link
Collaborator

👍

@stonemaster stonemaster merged commit d6a0e10 into dlang-tour:master Jun 13, 2016
@wilzbach wilzbach deleted the use_highlighter branch June 23, 2016 11:52
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