Skip to content

HOC2015: Level 15 instructions#4994

Merged
islemaster merged 6 commits into
stagingfrom
level-15-instructions
Nov 2, 2015
Merged

HOC2015: Level 15 instructions#4994
islemaster merged 6 commits into
stagingfrom
level-15-instructions

Conversation

@islemaster

Copy link
Copy Markdown
Contributor

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 for hoc2015, including changes to make the markdown instructions dialog look more like our classic instructions dialog (which we're using on the other levels).

screenshot from 2015-10-30 15 37 17

screenshot from 2015-10-30 15 37 30

markdownInstructions should replace -both- instructions
and instructions2 in the instructions popup (but should
still be used in the thumbnail below the viz).
@islemaster

Copy link
Copy Markdown
Contributor Author

Note: Waiting on feedback from Hadi.

Comment thread apps/src/studio/levels.js

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

@breville

Copy link
Copy Markdown
Member

stylistically i think i also prefer a dark grey to pure black for instruction text.

overall, looks great.

@islemaster

Copy link
Copy Markdown
Contributor Author

Updated to charcoal text inside details tags.

islemaster added a commit that referenced this pull request Nov 2, 2015
@islemaster islemaster merged commit f4cecc7 into staging Nov 2, 2015
@islemaster islemaster deleted the level-15-instructions branch November 2, 2015 17:58
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)
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