Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
* origin/dev: (72 commits)
  docs: add ie polyfills (#1342)
  fix(MdTooltip): `mdActive` never updated to true using `.sync` modifier
  chore: new component script (#1455)
  fix(MdTabs): fix indicator (#1448)
  fix(MdSelect): Reactive options (#1447)
  fix(MdTooltip): overlaying in dialog (#1446)
  fix(MdTabs): correct indicator position while alignment changed (#1442)
  fix(MdProgressSpinner): undefined navigator on SSR (#1441)
  docs(MdTabs): add missing md-icon prop (#1439)
  fix(MdRipple): clear ripples if called programatically (#1431)
  feat(MdListItemExpand): reactive expansion (#1435)
  feat(MdDatepicker): emit date without confirming (#1426)
  feat(MdDatepicker): add dateformat (#1436)
  feat(MdRipple): multiple waves (#1419)
  feat(MdDatepicker): custom first day of a week (#1409)
  feat(MdDatepicker): remove fixed label position (#1417)
  docs(MdDialog): add note about scrollable content (#1416)
  Update sponsorship links (#1427)
  fix(MdAutocomplete): prevent show options twice (#1410)
  fix(MdField): Consider number `0` as hasValue (#1407)
  ...
  • Loading branch information
marcos-hotmart committed Jan 29, 2018
2 parents 4308762 + daf58da commit a162827
Show file tree
Hide file tree
Showing 118 changed files with 1,216 additions and 639 deletions.
5 changes: 1 addition & 4 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ exclude_paths:
plugins:
eslint:
enabled: false

scss-lint:
enabled: true


duplication:
enabled: true
config:
Expand Down
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ Reporting a bug?
================
- Always search for your issue first. It may have already been answered, planned or fixed in some branch.
- Open one issue per subject. Cluttered issues will be closed.
- Make sure to only create issues for the newest version.
- Create a declarative title and describe clearly the steps necessary to reproduce the issue. If an issue labeled "need repro" receives no further input from the issue author for more than 3 days, it will be closed.
- If you want to show your code please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You could start with [this template](http://codepen.io/vue-material/pen/WGavBE).
- In case you found a solution by yourself, it could be helpful to explain how you fixed it.
- If you want to show your code, please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You can start with [this template](https://codepen.io/vue-material/pen/RxGmyb).
- In case you found a solution by yourself, it could be helpful to explain how you have fixed it.
- For bugs that involves build setups, you can create a reproduction repository with steps in the README.
- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
- If your issue is resolved but still open, don’t hesitate to close it.
Have a feature request?
=======================
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Build well-designed apps that can fit on every screen with support to all modern

## Sponsorship

Vue Material is proudly sponsored by [Rollbar](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
). They provide real-time error monitoring, alerting, and analytics for developers.
Vue Material is proudly sponsored by [Rollbar](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
). They provide real-time JavaScript error monitoring, alerting, and analytics for developers. :rocket:

You can try Rollbar for free at [https://rollbar.com](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
) <img src="https://cs.berry.sh/l/c0597778-f465-4788-abe3-8711cc087774/pixel.png" />
You can try Rollbar for free at [https://rollbar.com](https://codesponsor.io/t/c/93172542ee6813a9372c08c459fd1e5a/
) <img src="https://codesponsor.io/t/l/93172542ee6813a9372c08c459fd1e5a/pixel.png" />

## Demo and Documentation

Expand Down
1 change: 1 addition & 0 deletions build/docs/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const componentExampleLoader = require.resolve('../loaders/component-example-loa
const webpackConfig = {
entry: {
app: [
'babel-polyfill',
'./docs/app/index.js',
'./build/docs/offline.js'
]
Expand Down
3 changes: 2 additions & 1 deletion build/loaders/component-example-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ const pretty = require('pretty')
const prettier = require('prettier')
const path = require('path')
const compiler = require('vue-template-compiler')
const transpile = require('vue-template-es2015-compiler')
const { resolvePath } = require('../config')
const { transform } = require('babel-core')
const transpile = code => transform(code, {extends: resolvePath('.babelrc')}).code
const { getIndentedSource } = require('../../docs/app/mixins/codeSource')

function camelCaseToDash (str) {
Expand Down
1 change: 1 addition & 0 deletions build/local/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default {
devtool: 'cheap-module-eval-source-map',
entry: {
docs: [
'babel-polyfill',
'./docs/app/index.js',
'./build/local/client'
]
Expand Down
5 changes: 3 additions & 2 deletions build/new-component.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export default Vue => {

function getDocsFile (name) {
const singleName = name.replace('Md', '')
const docName = name.replace('Md', 'Doc')

return `<example src="./examples/Example.vue" />
Expand All @@ -105,7 +106,7 @@ function getDocsFile (name) {
import examples from 'docs-mixins/docsExample'
export default {
name: '${singleName}',
name: '${docName}',
mixins: [examples]
}
</script>
Expand Down Expand Up @@ -155,7 +156,7 @@ const rootDir = join(__dirname, '..')
const componentsPath = 'src/components/' + name
const componentIndex = 'src/components/index.js'
const themePath = 'src/theme/all.scss'
const docsPath = 'docs/app/pages/components/' + singleName
const docsPath = 'docs/app/pages/Components/' + singleName
const docsRoutePath = 'docs/app/routes.js'
const navPath = 'docs/app/template/MainNavContent.vue'

Expand Down
10 changes: 4 additions & 6 deletions docs/app/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Vue from 'vue'
import Axios from 'axios'
import VueRouter from 'vue-router'
import Vuei18n from 'vue-i18n'
import enUS from './i18n/en-US'
import i18nLocales from './i18n'
import { routes } from './routes'
import createRoute from './routes'

Expand All @@ -18,12 +18,10 @@ const mappedRoutes = routes.map(route => ({
component: () => import(`./pages/${route.page}`)
}))

export const currentLang = enUS
export const currentLang = i18nLocales.enUS
export const i18n = new Vuei18n({
locale: 'en-US',
messages: {
'en-US': enUS
}
locale: 'enUS',
messages: i18nLocales
})

export const router = new VueRouter({
Expand Down
265 changes: 0 additions & 265 deletions docs/app/i18n/en-US.js

This file was deleted.

6 changes: 6 additions & 0 deletions docs/app/i18n/en-US/components.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default {
code: {
copyMessage: 'Code copied!',
copy: 'Copy'
}
}
Loading

0 comments on commit a162827

Please sign in to comment.