You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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)
...
Copy file name to clipboardExpand all lines: .github/CONTRIBUTING.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ Before submitting your contribution please read the guidelines.
8
8
9
9
## Issue Reporting Guidelines
10
10
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.
12
12
13
13
- 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).
Copy file name to clipboardExpand all lines: README.md
+1-3Lines changed: 1 addition & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -88,9 +88,7 @@ Optionally import Roboto font & Material Icons from Google CDN:
88
88
89
89
## Questions
90
90
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.
Copy file name to clipboardExpand all lines: ROADMAP.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -222,10 +222,10 @@ I will point out those changes inside the migration guide.
222
222
<small>Vue Material 2 will be released with the new Material Design guidelines landed on Google I/O 2018. Stay tuned!<small>
223
223
224
224
## 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!
226
226
227
227
## 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.
229
229
230
230
## Awesome! I want to pay you a coffee!
231
231
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.
Copy file name to clipboardExpand all lines: docs/app/i18n/en-US/pages.js
+29-20Lines changed: 29 additions & 20 deletions
Original file line number
Diff line number
Diff line change
@@ -5,16 +5,16 @@ export default {
5
5
material: 'Material Design',
6
6
materialContent: 'Simple, lightweight and built exactly according to the Google Material Design specs.',
7
7
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.',
9
9
featured: 'Full-featured',
10
-
featuredContent: 'Complete with dynamic themes, ondemand 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.',
11
11
ecosystem: 'Ecosystem',
12
12
premium: 'Premium Themes',
13
13
viewProject: 'View project',
14
14
sponsors: 'Sponsors',
15
15
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'
18
18
},
19
19
about: {
20
20
title: 'About'
@@ -24,10 +24,16 @@ export default {
24
24
},
25
25
gettingStarted: {
26
26
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!',
28
28
installation: 'Installation',
29
29
npmOrYarn: 'NPM or Yarn'
30
30
},
31
+
configuration: {
32
+
title: 'Configuration',
33
+
viaVueGlobalObject: 'Via Vue global object',
34
+
inVueComponents: 'In Vue components',
35
+
options: 'Options',
36
+
},
31
37
themes: {
32
38
title: 'Themes'
33
39
},
@@ -47,6 +53,9 @@ export default {
47
53
title: 'Themes - Advanced',
48
54
nav: 'Advanced'
49
55
},
56
+
withRouter: {
57
+
title: 'Work with Vue Router'
58
+
},
50
59
components: {
51
60
title: 'Components',
52
61
},
@@ -64,15 +73,15 @@ export default {
64
73
app: {
65
74
title: 'App',
66
75
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.',
70
79
desc4: 'The {0} component supports {1}, {2} and {3}, which are aliases for {4}, {5} and {6} respectively. Look at the examples:'
71
80
},
72
81
regular: {
73
82
title: 'Regular Toolbars',
74
83
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.',
76
85
desc2: 'The order of {0} children is irrelevant. The component will take care of this based on the props that you pass.'
77
86
},
78
87
fixed: {
@@ -87,25 +96,25 @@ export default {
87
96
},
88
97
flexible: {
89
98
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.',
91
100
flexible: 'Flexible'
92
101
},
93
102
lastRow: {
94
103
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.',
96
105
fixed: 'Navigation fixed'
97
106
},
98
107
overlap: {
99
108
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!',
101
110
content: 'Overlapping content'
102
111
},
103
112
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:',
105
114
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.',
107
116
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.',
109
118
propsDesc: 'The following properties can be applied'
110
119
},
111
120
apiToolbar: {
@@ -122,12 +131,12 @@ export default {
122
131
},
123
132
props: {
124
133
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.',
126
135
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.',
131
140
mdScrollbar: 'Enables the md-scrollbar class to the scrollable content. Read more about the Scrollbar documentation.'
Copy file name to clipboardExpand all lines: docs/app/pages/About.vue
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -44,13 +44,13 @@
44
44
<sectionclass="page-container-section">
45
45
<h2class="md-title">Want to contribute with the Project?</h2>
46
46
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 <ahref="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 <ahref="https://discord.gg/vuematerial">Discord Server</a> to share ideas and to keep all the comunication in one place.</p>
48
48
</section>
49
49
50
50
<sectionclass="page-container-section">
51
51
<h2class="md-title">Need extra help?</h2>
52
52
53
-
<p>I'm always online on our <ahref="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 <ahref="https://discord.gg/vuematerial">Discord server</a>. If you need anything, fell free to ask me directly there. :)</p>
0 commit comments