Skip to content

Commit 35201c6

Browse files
committed
Merge upstream/dev into this branch
2 parents bad0b77 + 5f7182e commit 35201c6

File tree

160 files changed

+18419
-11185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+18419
-11185
lines changed

CHANGELOG.md

+1,770
Large diffs are not rendered by default.

FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: vue-material

README.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Vue.use(MdContent)
6969
Vue.use(MdTabs)
7070
```
7171

72-
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:
72+
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:
7373

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

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

103+
## Become a part of the Vue Material community
104+
105+
#### This project exists thanks to all the people who contribute
106+
<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>
107+
108+
#### Sponsors & Backers
109+
110+
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/vue-material)]
111+
112+
<a href="https://opencollective.com/vue-material#backers" target="_blank"><img src="https://opencollective.com/vue-material/tiers/backer.svg?avatarHeight=90" /></a>
113+
103114
## Credits and Thanks
104115

116+
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.
117+
105118
* <a href="https://github.com/elviskang" target="_blank">elviskang</a> for donating the npm package name!
106119
* <a href="https://github.com/brunocastro" target="_blank">Bruno Castro</a> for the awesome Vue Material Logo.
120+
* Supported by <a href="https://www.creative-tim.com/?ref=vuematerial.io" target="_blank">Creative Tim</a>
107121

108122
## License
109123

ROADMAP.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ Well. All kind of help are welcome. If you want to contribute with the project,
230230
## Awesome! I want to pay you a coffee!
231231
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.
232232

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

dist/components/MdApp/index.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/components/MdApp/index.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/components/MdAutocomplete/index.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)