Skip to content

Commit d3731a6

Browse files
committed
Merge remote-tracking branch 'origin' into docs/add-ads
* origin: (55 commits) fix(MdSvgLoader): svg loader for invalid / missing mimetype (#1942) docs(Icon): fix minor typo (#1973) fix(MdRouterLink): new router-link registration name (#1978) chore: apply discord vanity URL (#1927) docs(ROADMAP.md): replace dead slack invite link with discord invite link (#1924) docs(Table): fix grammar issues (#1902) feat: router link components improvements (#1651) fix(MdTable): recalculate fixed header width on data changes (#1877) fix(MdDialogContent): missing theme class (#1876) docs(Elevation and Layout): Typos fixed and improved documentation. (#1878) fix(MdTable): nextTick selection data (#1874) docs(BottomBar): fix typo (#1875) docs(MdButton): escape a tag (#1872) docs(Input): typos and correction chore: upgrade dependencies fix(MdField): remove firefox required box-shadow feat: disable complexity rules for some methods fix(MdProgressSpinner): fix CSP error (#1850) fix: MdBadge do not accept color #1854 issue (#1856) fix: fix the repeated generated css theme classes if there is multiple themes defined (#1784) ...
2 parents 01d8e48 + 4fa84a4 commit d3731a6

File tree

81 files changed

+1322
-10363
lines changed

Some content is hidden

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

81 files changed

+1322
-10363
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Before submitting your contribution please read the guidelines.
88

99
## Issue Reporting Guidelines
1010

11-
- Do not create questions. The issue list is exclusively for reports, bugs and feature requests. Use the [Discord server]( https://discord.gg/rgcmTtm) instead.
11+
- Do not create questions. The issue list is exclusively for reports, bugs and feature requests. Use the [Discord server]( https://discord.gg/vuematerial) instead.
1212

1313
- Always search for your issue first. It may have already been answered, planned or fixed in some branch. New components and features will be planned on [Milestones](https://github.com/vuematerial/vue-material/milestones) or on [Projects](https://github.com/vuematerial/vue-material/projects).
1414

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Questions
44
================
55
If you have any questions, ideas or you want to discuss with Vue Material community. Use the Discord instead.
6-
Follow this link: https://discord.gg/rgcmTtm
6+
Follow this link: https://discord.gg/vuematerial
77
88
Reporting a bug?
99
================

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ Optionally import Roboto font & Material Icons from Google CDN:
8888

8989
## Questions
9090

91-
If you have any questions, ideas or you want to discuss with Vue Material community. Use the [Discord](https://discord.gg/rgcmTtm)
92-
93-
Or you can use [Slack Channel](https://vue-material.slack.com). Follow this [invitation link for Slack](https://join.slack.com/t/vuematerial/shared_invite/MTgzMzU2NDQ5ODkwLTE0OTQ4MDI3MDAtNWYyZjhkNzEzMA).
91+
If you have any questions, ideas or you want to discuss with Vue Material community, use [Discord](https://discord.gg/vuematerial) to join us.
9492

9593
## Contributing
9694

ROADMAP.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ I will point out those changes inside the migration guide.
222222
<small>Vue Material 2 will be released with the new Material Design guidelines landed on Google I/O 2018. Stay tuned!<small>
223223

224224
## But man! I need the ___________
225-
Have something in mind? Need a new components? Created something meaningful and think that this can fit inside the lib? Let's discuss? We have a [Slack Channel](https://join.slack.com/t/vuematerial/shared_invite/MTgzMzU2NDQ5ODkwLTE0OTQ4MDI3MDAtNWYyZjhkNzEzMA) and I'm online there almost everyday. Send me a message!
225+
Have something in mind? Need a new components? Created something meaningful and think that this can fit inside the lib? Let's discuss? We have a [Discord Channel](https://discord.gg/vuematerial) and I'm online there almost everyday. Send me a message!
226226

227227
## I want to help. What do you need?
228-
Well. All kind of help are welcome. If you want to contribute with the project, just send me a message and I will tell what you can do. We recently created a Slack Channel to share ideas and to keep all the comunication in one place.
228+
Well. All kind of help are welcome. If you want to contribute with the project, just send me a message and I will tell what you can do. We recently created a Discord Channel to share ideas and to keep all the communication in one place.
229229

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.

docs/app/banner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ if (process.env.NODE_ENV === 'production') {
3232
console.log('%c Made with%c ♥ %cby Marcos Moura', text, emoji, text)
3333
console.log('%c', spacer)
3434
console.log('%c', spacer)
35-
console.log('%cLooking something specific? We can help you! Join us on discord: https://discord.gg/rgcmTtm', message)
35+
console.log('%cLooking something specific? We can help you! Join us on discord: https://discord.gg/vuematerial', message)
3636
}

docs/app/i18n/en-US/pages.js

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ export default {
55
material: 'Material Design',
66
materialContent: 'Simple, lightweight and built exactly according to the Google Material Design specs.',
77
compatible: 'Compatible',
8-
compatibleContent: 'Build well-designed apps that can fit on every screen with support to all modern Web Browsers.',
8+
compatibleContent: 'Build well-designed apps that can fit on every screen with support for all modern Web Browsers.',
99
featured: 'Full-featured',
10-
featuredContent: 'Complete with dynamic themes, on demand components and all with an easy-to-use API.',
10+
featuredContent: 'Complete with dynamic themes, on-demand components and all with an easy-to-use API.',
1111
ecosystem: 'Ecosystem',
1212
premium: 'Premium Themes',
1313
viewProject: 'View project',
1414
sponsors: 'Sponsors',
1515
backers: 'Backers',
16-
sponsorsDescription: 'Vue Material does not run under the umbrella of any company or something like that. Is an independent project created by {0} on his spare time, which became 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.',
17-
beAPatron: 'If you think that this project helped you or your company in any way, you can consider become a backer/sponsor on Patreon'
16+
sponsorsDescription: 'Vue Material does not run under the umbrella of any company or anything like that. It is an independent project created by {0} 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.',
17+
beAPatron: 'If you think that this project helped you or your company in any way, you can consider becoming a backer/sponsor on Patreon'
1818
},
1919
about: {
2020
title: 'About'
@@ -24,10 +24,16 @@ export default {
2424
},
2525
gettingStarted: {
2626
title: 'Getting Started',
27-
introduction: 'Vue Material is the best integration between Vue.js and Material Design specs! You can easily configure it to suit all your needs. All you have to do is choose an installation method that fits you better and follow it\'s instructions. Let\'s start!',
27+
introduction: 'Vue Material is the best integration between Vue.js and Material Design specs! You can easily configure it to suit all your needs. All you have to do is choose an installation method that suits your environment and follow it\'s instructions. Let\'s start!',
2828
installation: 'Installation',
2929
npmOrYarn: 'NPM or Yarn'
3030
},
31+
configuration: {
32+
title: 'Configuration',
33+
viaVueGlobalObject: 'Via Vue global object',
34+
inVueComponents: 'In Vue components',
35+
options: 'Options',
36+
},
3137
themes: {
3238
title: 'Themes'
3339
},
@@ -47,6 +53,9 @@ export default {
4753
title: 'Themes - Advanced',
4854
nav: 'Advanced'
4955
},
56+
withRouter: {
57+
title: 'Work with Vue Router'
58+
},
5059
components: {
5160
title: 'Components',
5261
},
@@ -64,15 +73,15 @@ export default {
6473
app: {
6574
title: 'App',
6675
intro: {
67-
desc1: 'The following patterns applies the elevations in which content should scroll, how to size flexible space, and when to anchor specific elements.',
68-
desc2: 'When building applications there is some repeated behaviours regarding the structure of the app. Responsive drawers, flexible toolbars, scrolling... Either scenario could repeat across all complex applications. This documentation website, for example, needs some of them, and maybe you\'ll need them too. To solve those problems the {0} was created.',
69-
desc3: 'It has all behaviour to build complex application shells, that will be simple, responsive and it will integrate seamlessly with the drawers, toolbars and content.',
76+
desc1: 'The following patterns apply the elevations in which content should scroll, how to size flexible space, and when to anchor specific elements.',
77+
desc2: 'When building applications there are some repeated behaviours regarding the structure of the app. Responsive drawers, flexible toolbars, scrolling... Any of these could repeat across complex applications. This documentation website, for example, needs some of them; and maybe you\'ll need them too. To solve those problems the {0} was created.',
78+
desc3: 'It contains all the behaviours you need to build complex application shells, that will be simple, responsive and it will integrate seamlessly with drawers, toolbars and content.',
7079
desc4: 'The {0} component supports {1}, {2} and {3}, which are aliases for {4}, {5} and {6} respectively. Look at the examples:'
7180
},
7281
regular: {
7382
title: 'Regular Toolbars',
7483
default: 'Default',
75-
desc1: 'When you need a toolbar, a responsive drawer and a content to be displayed following the Material Guidelines. This is the default behaviour.',
84+
desc1: 'This pattern can be used when you need a toolbar, a responsive drawer and content to be displayed following the Material Guidelines. This is the default behaviour.',
7685
desc2: 'The order of {0} children is irrelevant. The component will take care of this based on the props that you pass.'
7786
},
7887
fixed: {
@@ -87,25 +96,25 @@ export default {
8796
},
8897
flexible: {
8998
title: 'Flexible height and text size',
90-
desc: 'Maybe the focus of your page is the title, following by the content itself. The page that shows details of a single contact is a great example of this scenario. So you can use flexible behaviour to give higher piority to your content after scrolling.',
99+
desc: 'Maybe the focus of your page is the title, followed by the content itself. A page that shows the details of a single contact is a great example of this scenario. So you can use flexible behaviour to give higher piority to your content after scrolling.',
91100
flexible: 'Flexible'
92101
},
93102
lastRow: {
94103
title: 'The last toolbar row fixed',
95-
desc: 'When your page has some primary navigation buttons, such as tabs and others, you may want them to be always available. You can make the second row of your toolbar always visible, hiding the first one when it\'s not needed. As an example, the WhatsApp main page has this behaviour.',
104+
desc: 'When your page has some primary navigation buttons, such as tabs and others, you may want them to always be available. You can make the second row of your toolbar always visible, hiding the first one when it\'s not needed. As an example, the WhatsApp main page has this behaviour.',
96105
fixed: 'Navigation fixed'
97106
},
98107
overlap: {
99108
title: 'Flexible space with overlapping content',
100-
desc: 'If you want to give focus on the content cards you may want to use the overlap. It\'s just an awesome effect!',
109+
desc: 'If you want to give focus to the content cards, you may want to use the overlap. It\'s just an awesome effect!',
101110
content: 'Overlapping content'
102111
},
103112
apiApp: {
104-
desc: 'In both examples we have 3 distinct areas: Toolbar, Drawer and Content. You should create them using the following tags:',
113+
desc: 'In these examples we have 3 distinct areas: Toolbar, Drawer and Content. You should create them using the following tags:',
105114
toolbar: 'Creates the toolbar accepting any options from the md-toolbar',
106-
drawer: 'Places the drawer panel, that also accepts any options from the md-drawer. You can have a left or right placed drawers. Or both.',
115+
drawer: 'Places the drawer panel, that also accepts any options from the md-drawer. You can have a left or right placed drawer. Placing multiple drawers is currently not supported.',
107116
content: 'Here you will add any content for your page.',
108-
alert: 'Any other tag passed as a direct child of the md-app tag will be ignored. The component will only look for those three tags and choose the right placement for them.',
117+
alert: 'Any other tag passed as a direct child of the md-app tag will be ignored. The component will only look for these three tags and choose the right placement for them.',
109118
propsDesc: 'The following properties can be applied'
110119
},
111120
apiToolbar: {
@@ -122,12 +131,12 @@ export default {
122131
},
123132
props: {
124133
mdMode: 'Sets the toolbar mode. See below the detailed description of each mode.',
125-
mdModeFixed: 'Makes the toolbar fixed without any scrolling effect',
134+
mdModeFixed: 'Makes the toolbar fixed without any scrolling effect.',
126135
mdModeFixedLast: 'Keeps the second row of the toolbar fixed and always visible. This NEEDS two md-toolbar-row inside the Toolbar.',
127-
mdModeReveal: 'Hides the toolbar temporarily and show it after the scroll. This is a good approach for mobile.',
128-
mdModeFlexible: 'Makes the height and the title size flexible to give the content a higher priority',
129-
mdModeOverlap: 'Enables the overlapping content',
130-
mdWaterfall: 'Enables the waterfall effect, that can be combined with any md-mode',
136+
mdModeReveal: 'Hides the toolbar temporarily and shows it after the scroll. This is a good approach for mobile.',
137+
mdModeFlexible: 'Makes the height and the title size flexible to give the content a higher priority.',
138+
mdModeOverlap: 'Enables the overlapping content.',
139+
mdWaterfall: 'Enables the waterfall effect, that can be combined with any md-mode.',
131140
mdScrollbar: 'Enables the md-scrollbar class to the scrollable content. Read more about the Scrollbar documentation.'
132141
}
133142
},

docs/app/pages/About.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
<section class="page-container-section">
4545
<h2 class="md-title">Want to contribute with the Project?</h2>
4646

47-
<p>Well. All kind of help are welcome. If you want to contribute with the project, just send me a message and I will tell what you can do. We have a <a href="https://join.slack.com/t/vuematerial/shared_invite/MTgzMzU2NDQ5ODkwLTE0OTQ4MDI3MDAtNWYyZjhkNzEzMA">Slack Channel</a> to share ideas and to keep all the comunication in one place.</p>
47+
<p>Well. All kind of help are welcome. If you want to contribute with the project, just send me a message and I will tell what you can do. We have a <a href="https://discord.gg/vuematerial">Discord Server</a> to share ideas and to keep all the comunication in one place.</p>
4848
</section>
4949

5050
<section class="page-container-section">
5151
<h2 class="md-title">Need extra help?</h2>
5252

53-
<p>I'm always online on our <a href="https://join.slack.com/t/vuematerial/shared_invite/MTgzMzU2NDQ5ODkwLTE0OTQ4MDI3MDAtNWYyZjhkNzEzMA">Slack channel</a>. If you need anything, fell free to ask me directly there. :)</p>
53+
<p>I'm always online on our <a href="https://discord.gg/vuematerial">Discord server</a>. If you need anything, fell free to ask me directly there. :)</p>
5454
</section>
5555

5656
<section class="page-container-section">

docs/app/pages/Components/BottomBar/BottomBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<p>The bottom bar is compatible with all Vue Router options. Just pass the values as parameters on <code>md-bottom-bar-item</code> component:</p>
1616
<code-example title="With default fixed style" :component="examples['bar-router']" />
17-
<note-block tip>Note: Try tro change the url manually to see the component selecting the correct item.</note-block>
17+
<note-block tip>Note: Try to change the url manually to see the component selecting the correct item.</note-block>
1818
</div>
1919

2020
<div class="page-container-section">

docs/app/pages/Components/BottomBar/examples/BarRouter.vue

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,26 @@
22
<div>
33
<div class="phone-viewport">
44
<md-bottom-bar md-sync-route>
5-
<md-bottom-bar-item to="/components/bottom-bar/home" md-label="Home" md-icon="home"></md-bottom-bar-item>
5+
<md-bottom-bar-item to="/components/bottom-bar" exact md-label="Home" md-icon="home"></md-bottom-bar-item>
66
<md-bottom-bar-item to="/components/bottom-bar/posts" md-label="Posts" md-icon="/assets/icon-whatshot.svg"></md-bottom-bar-item>
77
<md-bottom-bar-item to="/components/bottom-bar/favorites" md-label="Favorites" md-icon="favorite"></md-bottom-bar-item>
88
</md-bottom-bar>
99
</div>
1010

1111
<div class="phone-viewport">
1212
<md-bottom-bar class="md-accent" md-sync-route>
13-
<md-bottom-bar-item to="/components/bottom-bar/home" md-label="Home" md-icon="home"></md-bottom-bar-item>
13+
<md-bottom-bar-item to="/components/bottom-bar" exact md-label="Home" md-icon="home"></md-bottom-bar-item>
1414
<md-bottom-bar-item to="/components/bottom-bar/posts" md-label="Posts" md-icon="/assets/icon-whatshot.svg"></md-bottom-bar-item>
1515
<md-bottom-bar-item to="/components/bottom-bar/favorites" md-label="Favorites" md-icon="favorite"></md-bottom-bar-item>
1616
</md-bottom-bar>
1717
</div>
18+
19+
<div class="phone-viewport">
20+
<md-bottom-bar class="md-accent" md-sync-route>
21+
<md-bottom-bar-item to="/components/bottom-bar/posts/1" md-label="Post 1" md-icon="/assets/icon-whatshot.svg"></md-bottom-bar-item>
22+
<md-bottom-bar-item to="/components/bottom-bar/posts/2" md-label="Post 2" md-icon="/assets/icon-whatshot.svg"></md-bottom-bar-item>
23+
</md-bottom-bar>
24+
</div>
1825
</div>
1926
</template>
2027

@@ -34,4 +41,8 @@
3441
border: 1px solid rgba(#000, .26);
3542
background: rgba(#000, .06);
3643
}
44+
45+
.md-bottom-bar .md-bottom-bar-item.router-link-active {
46+
text-shadow: 0 0 5px;
47+
}
3748
</style>

docs/app/pages/Components/Button/Button.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default {
8383
{
8484
name: 'href',
8585
type: 'String',
86-
description: 'Creates a anchor on the button. In this case the generated tag will be <a>.',
86+
description: 'Creates a anchor on the button. In this case the generated tag will be <code>&lt;a&gt;</code>.',
8787
defaults: 'null'
8888
},
8989
{

0 commit comments

Comments
 (0)