Skip to content

Commit

Permalink
Merge upstream/dev into this branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ittus committed Jun 19, 2020
2 parents bad0b77 + 5f7182e commit 35201c6
Show file tree
Hide file tree
Showing 160 changed files with 18,419 additions and 11,185 deletions.
1,770 changes: 1,770 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions FUNDING.yml
@@ -0,0 +1 @@
open_collective: vue-material
16 changes: 15 additions & 1 deletion README.md
Expand Up @@ -69,7 +69,7 @@ Vue.use(MdContent)
Vue.use(MdTabs)
```

Alternativelly you can <a href="https://github.com/vuematerial/vue-material/archive/master.zip" target="_blank" rel="noopener">download</a> and reference the script and the stylesheet in your HTML:
Alternatively you can <a href="https://github.com/vuematerial/vue-material/archive/master.zip" target="_blank" rel="noopener">download</a> and reference the script and the stylesheet in your HTML:

``` html
<link rel="stylesheet" href="path/to/vue-material.css">
Expand Down Expand Up @@ -100,10 +100,24 @@ Vue Material supports all [modern browsers](http://browserl.ist/?q=%3E%3D+1%25).

<small>May work in other browsers but it's untested.</small>

## Become a part of the Vue Material community

#### This project exists thanks to all the people who contribute
<a class="contributors-image" href="https://github.com/vuematerial/vue-material/contributors"><img src="https://opencollective.com/vue-material/contributors.svg?width=1500&button=false" /></a>

#### Sponsors & Backers

Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/vue-material)]

<a href="https://opencollective.com/vue-material#backers" target="_blank"><img src="https://opencollective.com/vue-material/tiers/backer.svg?avatarHeight=90" /></a>

## Credits and Thanks

Vue Material does not run under the umbrella of any company or anything like that. It is an independent project created by <a data-v-9248b2ee="" href="https://www.github.com/marcosmoura" target="_blank">Marcos Moura</a> in his spare time, which has become one of the most used UI Libraries for Vue.js. The development is active and we are working hard to release great things for you.

* <a href="https://github.com/elviskang" target="_blank">elviskang</a> for donating the npm package name!
* <a href="https://github.com/brunocastro" target="_blank">Bruno Castro</a> for the awesome Vue Material Logo.
* Supported by <a href="https://www.creative-tim.com/?ref=vuematerial.io" target="_blank">Creative Tim</a>

## License

Expand Down
6 changes: 3 additions & 3 deletions ROADMAP.md
Expand Up @@ -230,10 +230,10 @@ Well. All kind of help are welcome. If you want to contribute with the project,
## Awesome! I want to pay you a coffee!
Vue Material do not run under the umbrella of any company or something like that, and is an independent project created by me on spare time. It became one of the most used UI Libraries for Vue.js.

If you think that this project helped you or your company in some way, you can consider become a backer/sponsor on Patreon:
If you think that this project helped you or your company in some way, you can consider become a backer/sponsor on Open Collective:
<p>
<a href="https://www.patreon.com/marcosmoura" target="_blank">
<img width="150" src="https://c5.patreon.com/external/logo/become_a_patron_button.png">
<a href="https://opencollective.com/vue-material" target="_blank">
<img src="https://opencollective.com/vue-material/tiers/backer.svg?avatarHeight=36">
</a>
</p>

Expand Down
6 changes: 3 additions & 3 deletions dist/components/MdApp/index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/components/MdApp/index.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/components/MdAutocomplete/index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 35201c6

Please sign in to comment.