diff --git a/.gitignore b/.gitignore index df314fd8f..44c37ee12 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ lib examples/element-ui examples/pages/en-US examples/pages/zh-CN +examples/pages/es fe.element/element-ui .npmrc coverage diff --git a/README.md b/README.md index ce698fbed..e83727b46 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,18 @@ > A Vue.js 2.0 UI Toolkit for Web. +

+ Special thanks to the generous sponsorship by: +

+

+ Tipo.io +

+

+ + + +

+ ## Links - Homepage and documentation - International users: http://element.eleme.io/ diff --git a/examples/assets/images/tipe.svg b/examples/assets/images/tipe.svg new file mode 100644 index 000000000..e4026a1c5 --- /dev/null +++ b/examples/assets/images/tipe.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Asset 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/components/footer.vue b/examples/components/footer.vue index 64caddd65..c3e710c0e 100644 --- a/examples/components/footer.vue +++ b/examples/components/footer.vue @@ -139,10 +139,22 @@ margin: 10px; } } + @media (max-width: 1140px) { + .footer { + height: auto; + } + } + + @media (max-width: 1000px) { + .footer-social { + display: none; + } + } + @media (max-width: 768px) { .footer { - .footer-social { - display: none; + .footer-main { + margin-bottom: 30px; } } } diff --git a/examples/docs/en-US/table.md b/examples/docs/en-US/table.md index babda5a2e..d6ecb6d56 100644 --- a/examples/docs/en-US/table.md +++ b/examples/docs/en-US/table.md @@ -1407,7 +1407,7 @@ Filter the table to find desired data. ### Custom column template Customize table column so it can be integrated with other components. -:::demo You have access to the following data: row, column, $index and store (state management of Table) by [Scoped slot](https://vuejs.org/v2/guide/components.html#Scoped-Slots). (Scoped slots is supported from `1.1`, `inline-template` still works, but it's not recommended). +:::demo You have access to the following data: row, column, $index and store (state management of Table) by [Scoped slot](https://vuejs.org/v2/guide/components.html#Scoped-Slots). ```html