Skip to content
This repository was archived by the owner on Sep 16, 2020. It is now read-only.

Sync with upstream #26

Merged
merged 20 commits into from
Oct 10, 2017
Merged

Sync with upstream #26

merged 20 commits into from
Oct 10, 2017

Conversation

phanan
Copy link
Member

@phanan phanan commented Oct 9, 2017

No description provided.

phanan and others added 19 commits October 7, 2017 10:35
* Fix: Demystified markdown logic

I have changes jsfiddle link with a similar jsfiddle. 

The difference between two jsfiddle is in javascript code, `marked()` has a comment mentioning its source as external library. 

This is important because it is easy to assume that `marked()` cmes from an external library instead of Vue, especially for a beginner.

* make dependencies apparent in markdown example
correct the opening and closing `h4` tags
* Make the statement less definitive

* Reword the tip
* Add additional resources to dropdown

* reorganize ecosystem dropdown, adding Tooling

* Move roadmap to News section of ecosystem dropdown

* Update "Core Plugins" to "Core Libraries"
I suggest add this params demo because i can not understand when i saw this part,i think other people will have the same confusion
# Conflicts:
#	themes/vue/layout/partials/ecosystem_dropdown.ejs
#	themes/vue/layout/partials/sponsors.ejs
# Conflicts:
#	src/v2/guide/class-and-style.md
#	src/v2/guide/instance.md
@phanan phanan merged commit 55d07a1 into master Oct 10, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants