Skip to content

Commit bb74d0f

Browse files
committed
Merge remote-tracking branch 'origin'
* origin: (80 commits) docs: remove wrong text-shadow docs: add referal code fix(MdProgressSpinner): improve transition (#1946) chore: upgrade deps docs: fix 2 wrong property names with autocomplete docs (#2006) fix(MdTable): undefined table sorting #1906 (#2012) docs: fix dynamic tooltip text to show bottom instead of top (#2013) refactor(MdDatepicker): upgrade date-fns (#2037) fix(MdDatepicker): positioning when used inside flex container (#2036) fix(MdSelect): infinite loop error, when no v-model provided (#2035) fix(MdApp): normalized component's tag before checking to match slot … (#1994) chore: some misspellings in config.js (#1986) fixFixed non unique ids on MdSelect (#2001) fix(MdInput): invert password on-off icons (#2008) test: fix test selectors for checkbox and switch (#2009) docs: add default theme as a suggestion (#2043) Fixed md-wave transition (#2034) fix(MdRipple): fixed missing ripple effect (#2059) docs: add codefund ads and remove old sponsors fix(MdSvgLoader): svg loader for invalid / missing mimetype (#1942) ...
2 parents f1b65ea + f9fa6dd commit bb74d0f

File tree

109 files changed

+5791
-2700
lines changed

Some content is hidden

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

109 files changed

+5791
-2700
lines changed

Diff for: .github/CONTRIBUTING.md

+1-1
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

Diff for: .github/ISSUE_TEMPLATE.md

+1-1
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
================

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ coverage/
77
yarn-debug.log
88
npm-debug.log
99
.vscode
10+
.idea

Diff for: README.md

+3-17
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,15 @@
1111
<img src="https://travis-ci.org/vuematerial/vue-material.svg?branch=master" alt="Build Status">
1212
</a>
1313

14-
<!--a href="https://codeclimate.com/github/vuematerial/vue-material/coverage">
15-
<img src="https://codeclimate.com/github/vuematerial/vue-material/badges/coverage.svg">
16-
</a-->
17-
1814
<a href="https://www.npmjs.com/package/vue-material">
1915
<img src="https://img.shields.io/npm/dt/vue-material.svg" alt="Downloads">
2016
</a>
2117

2218
<a href="https://www.npmjs.com/package/vue-material">
2319
<img src="https://img.shields.io/npm/l/vue-material.svg" alt="License">
2420
</a>
25-
26-
<a href="https://discord.gg/rgcmTtm">
21+
22+
<a href="https://discord.gg/vuematerial">
2723
<img src="https://img.shields.io/discord/379653048798281729.svg?logo=discord&colorB=7289DA" alt="Chat">
2824
</a>
2925
</p>
@@ -32,14 +28,6 @@ Vue Material is Simple, lightweight and built exactly according to the Google <a
3228

3329
Build well-designed apps that can fit on every screen with support to all modern Web Browsers with dynamic themes, components on demand and all with an ease-to-use API
3430

35-
## Sponsorship
36-
37-
Vue Material is proudly sponsored by [Rollbar](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
38-
). They provide real-time JavaScript error monitoring, alerting, and analytics for developers. :rocket:
39-
40-
You can try Rollbar for free at [https://rollbar.com](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
41-
) <img src="https://codesponsor.io/t/l/93172542ee6813a9372c08c459fd1e5a/pixel.png" />
42-
4331
## Demo and Documentation
4432

4533
<a href="https://vuematerial.io/" target="_blank">Documentation & demos</a>
@@ -100,9 +88,7 @@ Optionally import Roboto font & Material Icons from Google CDN:
10088

10189
## Questions
10290

103-
If you have any questions, ideas or you want to discuss with Vue Material community. Use the [Discord](https://discord.gg/rgcmTtm)
104-
105-
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.
10692

10793
## Contributing
10894

Diff for: ROADMAP.md

+2-2
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.

Diff for: build/config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ export const resolvePath = (...args) => {
88
}
99

1010
export const getRandomInt = (min, max) => {
11-
const minNotAlowed = 8080
12-
const maxNotAlowed = 8090
11+
const minNotAllowed = 8080
12+
const maxNotAllowed = 8090
1313
const generated = Math.floor(Math.random() * (max - min + 1)) + min
1414

15-
if (generated >= minNotAlowed && generated <= maxNotAlowed) {
15+
if (generated >= minNotAllowed && generated <= maxNotAllowed) {
1616
return getRandomInt(min, max)
1717
}
1818

Diff for: docs/app/App.vue

+1-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
</div>
1414

1515
<main-footer />
16-
17-
<md-snackbar class="version-message" md-theme="default" :md-active.sync="message" :md-duration="Infinity">
18-
<span>This site is for the Vue Material 1.0 beta.</span>
19-
<div>
20-
<md-button href="https://vue-material-old.netlify.com/" target="_blank">Visit old docs</md-button>
21-
<md-button class="md-accent" @click="closeMessage">Dismiss</md-button>
22-
</div>
23-
</md-snackbar>
2416
</div>
2517
</template>
2618

@@ -87,6 +79,7 @@
8779
8880
body {
8981
height: 100%;
82+
overflow-x: hidden;
9083
}
9184
</style>
9285

Diff for: docs/app/banner.js

+1-1
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
}

Diff for: docs/app/components/AdManager.vue

+22-93
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,30 @@
11
<template>
2-
<md-content class="ad-manager" id="ad-manager" md-theme="default">
3-
<div id="code-sponsor" class="code-sponsor">
4-
<span class="code-sponsor-header">Vue Material is proudly sponsored by:</span>
5-
6-
<a :href="linkHref" class="code-sponsor-content" target="_blank" rel="noopener">
7-
<strong class="code-sponsor-name">Rollbar</strong>
8-
<span class="code-sponsor-description">Real-time JavaScript error monitoring, alerting, and analytics for developers 🚀</span>
9-
</a>
10-
11-
<img class="code-sponsor-pixel" :src="pixelHref" />
12-
</div>
2+
<md-content class="ad-manager" id="ad-manager" md-theme="docs-dark">
3+
<div id="code-fund" class="code-fund"></div>
134
</md-content>
145
</template>
156

167
<script>
17-
const isProd = process.env.NODE_ENV === 'production'
18-
const token = '0989e0dbf1919e50f5b34ab00c81fa6f'
19-
208
export default {
219
name: 'AdManager',
22-
computed: {
23-
linkHref () {
24-
if (isProd) {
25-
return `https://codesponsor.io/t/c/${token}`
26-
}
10+
methods: {
11+
getSponsor () {
12+
let sponsorUrl = 'https://api.codefund.app/properties/60/funder.html'
2713
28-
return false
29-
},
30-
pixelHref () {
31-
if (isProd) {
32-
return `https://codesponsor.io/t/l/${token}/pixel.png`
14+
if (this.$route.name !== 'home') {
15+
sponsorUrl += '?theme=light'
3316
}
3417
35-
return false
18+
this.$http.get(sponsorUrl).then(({ data }) => {
19+
document.getElementById('code-fund').innerHTML = data;
20+
})
3621
}
22+
},
23+
mounted () {
24+
this.getSponsor()
25+
},
26+
updated () {
27+
this.getSponsor()
3728
}
3829
}
3930
</script>
@@ -44,22 +35,6 @@
4435
$ad-responsive-big: 1690px;
4536
$ad-responsive-small: 768px;
4637
47-
@mixin ad-theme ($hue, $color) {
48-
.code-sponsor {
49-
background: md-get-palette-color(grey, $hue);
50-
.code-sponsor-header {
51-
color: rgba($color, .54);
52-
}
53-
}
54-
55-
.code-sponsor-content {
56-
color: rgba($color, .7);
57-
&:hover {
58-
color: $color;
59-
}
60-
}
61-
}
62-
6338
.ad-manager {
6439
width: calc(100% + 32px);
6540
margin: 0 -16px -16px;
@@ -69,9 +44,9 @@
6944
}
7045
}
7146
72-
.code-sponsor {
47+
.code-fund {
7348
max-width: 175px;
74-
margin: 7px 16px 24px 16px;
49+
margin: 0 16px 24px 16px;
7550
padding: 8px;
7651
display: flex;
7752
flex-direction: column;
@@ -84,71 +59,25 @@
8459
@media (min-width: $ad-responsive-big) {
8560
margin: 0;
8661
position: fixed;
87-
right: 16px;
88-
bottom: 16px;
62+
top: 80px;
63+
right: 24px;
8964
z-index: 1000;
9065
}
9166
9267
@media (max-width: $ad-responsive-small) {
9368
max-width: none;
94-
margin-bottom: 16px;
69+
margin: 8px auto 16px;
9570
float: none;
9671
}
9772
9873
.splash-container & {
9974
@media (max-width: $ad-responsive-big) {
10075
max-width: 530px;
10176
min-height: 100px;
102-
margin: 8px auto;
77+
margin: 60px auto 8px;
10378
float: none;
10479
background: none !important;
10580
}
10681
}
10782
}
108-
109-
.code-sponsor-header {
110-
font-size: 11px;
111-
line-height: 1.3em;
112-
}
113-
114-
.code-sponsor-content {
115-
margin-top: 1em;
116-
&:hover {
117-
text-decoration: none;
118-
}
119-
}
120-
121-
.code-sponsor-name,
122-
.code-sponsor-description {
123-
&:hover {
124-
text-decoration: underline;
125-
}
126-
}
127-
128-
.code-sponsor-name {
129-
margin-bottom: .5em;
130-
display: block;
131-
font-weight: 600;
132-
}
133-
134-
.code-sponsor-pixel {
135-
width: 1px;
136-
height: 1px;
137-
margin: -1px;
138-
padding: 0;
139-
position: absolute;
140-
overflow: hidden;
141-
clip: rect(0 0 0 0);
142-
border: 0;
143-
}
144-
145-
.main-container {
146-
@include ad-theme(200, #000);
147-
}
148-
149-
.splash-container {
150-
@media (min-width: $ad-responsive-big) {
151-
@include ad-theme(800, #fff);
152-
}
153-
}
15483
</style>

Diff for: docs/app/components/CodesandboxEdit.vue

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
})
5050
`
5151
52-
import { getParameters } from "codesandbox/lib/api/define";
52+
import { getParameters } from 'codesandbox/lib/api/define';
5353
5454
export default {
5555
name: 'CodesandboxEdit',
@@ -64,29 +64,29 @@
6464
parameters () {
6565
return getParameters({
6666
files: {
67-
"package.json": {
67+
'package.json': {
6868
content: {
6969
name: `Vue Material - ${this.title}`,
7070
keywords: [
71-
"vue-material",
72-
"material-design",
73-
"vue"
71+
'vue-material',
72+
'material-design',
73+
'vue'
7474
],
7575
dependencies: {
76-
vue: "latest",
77-
"vue-material": "latest"
76+
vue: 'latest',
77+
'vue-material': 'latest'
7878
}
7979
}
8080
},
81-
"index.js": {
81+
'index.js': {
8282
content: index
8383
},
84-
"index.html": {
84+
'index.html': {
8585
content: html
8686
},
87-
"App.vue": {
87+
'App.vue': {
8888
content: this.source
89-
},
89+
}
9090
}
9191
})
9292
}

Diff for: docs/app/components/PageContainer.vue

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
transform: translate3d(0, 150px, 0);
6060
transition-property: opacity, transform;
6161
will-change: opacity, transform;
62+
63+
.ad-manager {
64+
display: none;
65+
}
6266
}
6367
6468
.page-container-enter-to {

Diff for: docs/app/components/SplashContainer.vue

-6
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22
<transition name="splash-container">
33
<div class="splash-container main-container" :class="{ centered }">
44
<slot />
5-
6-
<ad-manager />
75
</div>
86
</transition>
97
</template>
108

119
<script>
1210
import * as types from 'store/mutation-types'
1311
import { mapActions, mapMutations, mapState } from 'vuex'
14-
import AdManager from './AdManager'
1512
1613
export default {
1714
name: 'SplashContainer',
18-
components: {
19-
AdManager
20-
},
2115
props: {
2216
title: String,
2317
centered: Boolean

0 commit comments

Comments
 (0)