HOC2015: Level 15 instructions#4994
Merged
Merged
Conversation
markdownInstructions should replace -both- instructions and instructions2 in the instructions popup (but should still be used in the thumbnail below the viz).
Contributor
Author
|
Note: Waiting on feedback from Hadi. |
Member
There was a problem hiding this comment.
i suspect we'll need to get instructions out of this file and into a translatable json file in the near future, and it's tracked on our to-do list. just mentioning in case it'll be easier for you to do sooner than later.
Member
|
stylistically i think i also prefer a dark grey to pure black for instruction text. overall, looks great. |
Contributor
Author
|
Updated to charcoal text inside details tags. |
islemaster
added a commit
that referenced
this pull request
Nov 2, 2015
HOC2015: Level 15 instructions
deploy-code-org
added a commit
that referenced
this pull request
Nov 2, 2015
f4cecc7 Merge pull request #4994 from code-dot-org/level-15-instructions (Brad Buchanan) b14b8b1 Merge pull request #5015 from code-dot-org/revert-5009-iframe_domain_whitelist (philbogle) c928a7c Revert "Support CDO.allowed_iframe_ancestors configuration to whitelist allowed domains" (philbogle) 1e44018 Merge pull request #5009 from code-dot-org/iframe_domain_whitelist (philbogle) 7804029 Update environment.rb (philbogle) ebbc090 Set Content-Security-Policy to whitelist allowed domains (Phil Bogle) 3894748 Merge pull request #5008 from code-dot-org/dynamic-config-env (Trevor Berg)
deploy-code-org
added a commit
that referenced
this pull request
Nov 2, 2015
57936c9 Merge pull request #5004 from code-dot-org/level-15-final-dialog (Brad Buchanan) a959f57 content changes (-asher) (Continuous Integration) c5fc742 Automatically built. (Continuous Integration) f4cecc7 Merge pull request #4994 from code-dot-org/level-15-instructions (Brad Buchanan) b14b8b1 Merge pull request #5015 from code-dot-org/revert-5009-iframe_domain_whitelist (philbogle)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Use markdown instructions in level 15 so that we can use a
<details>tag to hide "extra" content - project ideas and info. Adds some special styles forhoc2015, including changes to make the markdown instructions dialog look more like our classic instructions dialog (which we're using on the other levels).