From d34e38a936632b6fbbd41e40296e57e1dc198b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?= Date: Thu, 28 Sep 2017 22:36:38 -0500 Subject: [PATCH] docs style groundwork (#7281) * docs style groundwork * update docs style --- CHANGELOG.en-US.md | 2 +- CHANGELOG.zh-CN.md | 2 +- examples/app.vue | 23 ++++++++- examples/bus.js | 2 + examples/components/footer-nav.vue | 2 +- examples/components/header.vue | 30 ++++++++--- examples/pages/template/component.tpl | 74 ++++++++++++++++++++++----- 7 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 examples/bus.js diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index f15ec285f..c017b5235 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -641,4 +641,4 @@ Breaking change *2016-11-9* -Element 1.0.0 released. +- Element 1.0.0 released. diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 68fa3326a..765e14ec3 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -777,4 +777,4 @@ *2016-08-30* -Element 1.0.0-rc.1 发布 +- Element 1.0.0-rc.1 发布 diff --git a/examples/app.vue b/examples/app.vue index 331068574..05d15bb68 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -11,6 +11,22 @@ #app { height: 100%; + + @when component { + .main-cnt { + padding: 0; + margin-top: 0; + min-height: auto; + } + .headerWrapper { + position: fixed; + width: 100%; + left: 0; + top: 0; + z-index: 1000; + border-bottom: solid 1px #ccc; + } + } } body { @@ -167,12 +183,12 @@ @@ -188,6 +204,9 @@ computed: { lang() { return this.$route.path.split('/')[1] || 'zh-CN'; + }, + isComponent() { + return /^component-/.test(this.$route.name || ''); } }, diff --git a/examples/bus.js b/examples/bus.js new file mode 100644 index 000000000..c17d88ac5 --- /dev/null +++ b/examples/bus.js @@ -0,0 +1,2 @@ +import Vue from 'vue'; +export default new Vue(); diff --git a/examples/components/footer-nav.vue b/examples/components/footer-nav.vue index f43214a68..2a8b5117d 100644 --- a/examples/components/footer-nav.vue +++ b/examples/components/footer-nav.vue @@ -90,7 +90,7 @@ methods: { setNav() { let nav = navConfig[this.lang]; - this.nav = nav[0].children.concat(nav[1]); + this.nav = [nav[0]].concat(nav[2].children); nav[3].groups.map(group => group.list).forEach(list => { this.nav = this.nav.concat(list); }); diff --git a/examples/components/header.vue b/examples/components/header.vue index e66138a8a..001e632ef 100644 --- a/examples/components/header.vue +++ b/examples/components/header.vue @@ -1,6 +1,11 @@