diff --git a/src/components/helpers/Parameters.vue b/src/components/helpers/Parameters.vue
index 4a3fbcf7f..29e5ddf8e 100644
--- a/src/components/helpers/Parameters.vue
+++ b/src/components/helpers/Parameters.vue
@@ -231,7 +231,7 @@
return this.genTypescriptDef(props)
},
genDefault (value) {
- if (typeof value !== 'string') return JSON.stringify(value)
+ if (typeof value !== 'string') return JSON.stringify(value, null, 2)
else return value
},
genTypescriptDef (obj) {
diff --git a/src/data/components.json b/src/data/components.json
index 038958c0e..6c4e3df43 100644
--- a/src/data/components.json
+++ b/src/data/components.json
@@ -549,7 +549,8 @@
"switchesBoolean",
"switchesArray",
"switchesStates",
- "switchesColors"
+ "switchesColors",
+ "labelSlot"
],
"spec": false
},
@@ -669,6 +670,7 @@
"clearable",
"iconEvents",
"iconSlots",
+ "labelSlot",
"characterCounter",
"password",
"validation",
@@ -713,6 +715,9 @@
"toolbars": {
"components": [
"v-toolbar",
+ "v-toolbar-items",
+ "v-toolbar-side-icon",
+ "v-toolbar-title",
"v-system-bar"
],
"examples": [
diff --git a/src/data/layout/app-drawer-items.js b/src/data/layout/app-drawer-items.js
index 1c38b7618..f798123be 100644
--- a/src/data/layout/app-drawer-items.js
+++ b/src/data/layout/app-drawer-items.js
@@ -103,6 +103,9 @@ export default [
{ name: 'windows', title: 'Windows' }
]
},
+ { name: 'hover', title: 'Hover' },
+ { name: 'icons', title: 'Icons' },
+ { name: 'images', 'title': 'Images' },
{
title: 'Inputs & controls',
group: '(autocompletes|combobox|forms|inputs|overflow-btns|selects|selection|text-fields|sliders|textarea)',
@@ -120,9 +123,6 @@ export default [
{ name: 'text-fields', title: 'Text fields' }
]
},
- { name: 'hover', title: 'Hover' },
- { name: 'icons', title: 'Icons' },
- { name: 'images', 'title': 'Images' },
{ name: 'jumbotrons', title: 'Jumbotrons', badge: 'deprecated', color: 'black' },
{ name: 'lists', title: 'Lists' },
{ name: 'menus', title: 'Menus' },
diff --git a/src/examples/date-pickers/dateColorable.vue b/src/examples/date-pickers/dateColorable.vue
index 315980273..c4c1ac81e 100644
--- a/src/examples/date-pickers/dateColorable.vue
+++ b/src/examples/date-pickers/dateColorable.vue
@@ -13,8 +13,8 @@
export default {
data () {
return {
- picker: null,
- picker2: null
+ picker: new Date().toISOString().substr(0, 10),
+ picker2: new Date().toISOString().substr(0, 10)
}
}
}
diff --git a/src/examples/date-pickers/dateCurrent.vue b/src/examples/date-pickers/dateCurrent.vue
index 09daad729..60541d7ad 100644
--- a/src/examples/date-pickers/dateCurrent.vue
+++ b/src/examples/date-pickers/dateCurrent.vue
@@ -13,7 +13,7 @@
export default {
data () {
return {
- date1: null,
+ date1: new Date().toISOString().substr(0, 10),
date2: '2013-07-29'
}
}
diff --git a/src/examples/date-pickers/dateDialogAndMenu.vue b/src/examples/date-pickers/dateDialogAndMenu.vue
index b9f07e7ed..cadec401c 100644
--- a/src/examples/date-pickers/dateDialogAndMenu.vue
+++ b/src/examples/date-pickers/dateDialogAndMenu.vue
@@ -54,11 +54,9 @@
-
-
+
@@ -83,7 +80,7 @@
diff --git a/src/examples/date-pickers/monthColorable.vue b/src/examples/date-pickers/monthColorable.vue
index 64752c0e7..da462e791 100644
--- a/src/examples/date-pickers/monthColorable.vue
+++ b/src/examples/date-pickers/monthColorable.vue
@@ -13,8 +13,8 @@
export default {
data () {
return {
- picker: null,
- picker2: null
+ picker: new Date().toISOString().substr(0, 7),
+ picker2: new Date().toISOString().substr(0, 7)
}
}
}
diff --git a/src/examples/date-pickers/monthCurrent.vue b/src/examples/date-pickers/monthCurrent.vue
index 8f638d8a4..167bf301e 100644
--- a/src/examples/date-pickers/monthCurrent.vue
+++ b/src/examples/date-pickers/monthCurrent.vue
@@ -13,7 +13,7 @@
export default {
data () {
return {
- month1: null,
+ month1: new Date().toISOString().substr(0, 7),
month2: '2013-09'
}
}
diff --git a/src/examples/date-pickers/monthDialogAndMenu.vue b/src/examples/date-pickers/monthDialogAndMenu.vue
index 7dfe7a86e..7c3062c28 100644
--- a/src/examples/date-pickers/monthDialogAndMenu.vue
+++ b/src/examples/date-pickers/monthDialogAndMenu.vue
@@ -64,7 +64,7 @@
diff --git a/src/examples/dialogs/form.vue b/src/examples/dialogs/form.vue
index a2ab3b907..59f84230f 100644
--- a/src/examples/dialogs/form.vue
+++ b/src/examples/dialogs/form.vue
@@ -1,6 +1,6 @@
-
+
Open Dialog
@@ -10,29 +10,29 @@
-
+
-
+
-
+
@@ -41,7 +41,6 @@
:items="['Skiing', 'Ice hockey', 'Soccer', 'Basketball', 'Hockey', 'Reading', 'Writing', 'Coding', 'Basejump']"
label="Interests"
multiple
- chips
>
diff --git a/src/examples/layouts/complex.vue b/src/examples/layouts/complex.vue
index f5c7b42c5..7e36eb52d 100644
--- a/src/examples/layouts/complex.vue
+++ b/src/examples/layouts/complex.vue
@@ -94,10 +94,10 @@
diff --git a/src/examples/text-fields/labelSlot.vue b/src/examples/text-fields/labelSlot.vue
new file mode 100755
index 000000000..23cbe4fac
--- /dev/null
+++ b/src/examples/text-fields/labelSlot.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+ What about icon here? find_in_page
+
+
+
+
+
diff --git a/src/examples/windows/onboarding.vue b/src/examples/windows/onboarding.vue
index 3de26e7c6..af02d7721 100644
--- a/src/examples/windows/onboarding.vue
+++ b/src/examples/windows/onboarding.vue
@@ -82,3 +82,9 @@
}
}
+
+
+ {
+ "css": ["https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css"]
+ }
+
diff --git a/src/examples/windows/usage.vue b/src/examples/windows/usage.vue
index 4fceabb74..ca0fef814 100644
--- a/src/examples/windows/usage.vue
+++ b/src/examples/windows/usage.vue
@@ -69,3 +69,9 @@
})
}
+
+
+ {
+ "css": ["https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css"]
+ }
+
diff --git a/src/lang/en/components/SelectionControls.json b/src/lang/en/components/SelectionControls.json
index e8cd54513..14b9fdf83 100644
--- a/src/lang/en/components/SelectionControls.json
+++ b/src/lang/en/components/SelectionControls.json
@@ -53,6 +53,10 @@
"switchesColors": {
"header": "Switches - Colors",
"desc": "Switches can be colored by using any of the builtin colors and contextual names using the `color` prop."
+ },
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Selection controls' labels can be defined in `label` slot - that will allow to use HTML content"
}
},
"props": {
diff --git a/src/lang/en/components/TextFields.json b/src/lang/en/components/TextFields.json
index f4bf6badd..8fa7b796b 100644
--- a/src/lang/en/components/TextFields.json
+++ b/src/lang/en/components/TextFields.json
@@ -31,6 +31,10 @@
"header": "Icon slots",
"desc": "Instead of using prepend / append / append-outer icons you can use slots to extend input's functionality."
},
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Text field label can be defined in `label` slot - that will allow to use HTML content"
+ },
"characterCounter": {
"header": "Character counter",
"desc": "Use a `counter` prop to inform a user of the character limit. The counter does not perform any validation by itself. You will need to pair it with either the internal validation system, or a 3rd party library. You can use it on regular, box or outline text fields."
diff --git a/src/lang/en/components/Toolbars.json b/src/lang/en/components/Toolbars.json
index f4f3d46ed..af677e0d2 100644
--- a/src/lang/en/components/Toolbars.json
+++ b/src/lang/en/components/Toolbars.json
@@ -57,7 +57,7 @@
},
"systemBarsStatusWindow": {
"header": "System bars - status/window",
- "desc": "System bars are useful for notification icons on mobile and desktop. For live examples of, head to the pre-defined layouts."
+ "desc": "System bars are useful for notification icons on mobile and desktop. For live examples of these, head to the pre-defined layouts."
}
},
"props": {
diff --git a/src/lang/en/components/Treeview.json b/src/lang/en/components/Treeview.json
index f51f4d2b8..95dcc4684 100644
--- a/src/lang/en/components/Treeview.json
+++ b/src/lang/en/components/Treeview.json
@@ -22,23 +22,23 @@
"v-treeview": {
"activatable": "Allows user to mark a node as active by clicking on it",
"active": "Syncable prop that allows one to control which nodes are active. The array consists of the `item-key` of each active item.",
- "expand-icon": "Icon used to indicate that a node can be expanded",
+ "expandIcon": "Icon used to indicate that a node can be expanded",
"hoverable": "Applies a hover class when mousing over nodes",
- "indeterminate-icon": "Icon used when node is in an indeterminate state",
- "item-children": "Property on supplied `items` that contains its children",
- "item-key": "Property on supplied `items` used to keep track of node state. The value of this property has to be unique among all items.",
- "item-text": "Property on supplied `items` that contains its label text",
+ "indeterminateIcon": "Icon used when node is in an indeterminate state",
+ "itemChildren": "Property on supplied `items` that contains its children",
+ "itemKey": "Property on supplied `items` used to keep track of node state. The value of this property has to be unique among all items.",
+ "itemText": "Property on supplied `items` that contains its label text",
"items": "An array of items used to build the treeview",
- "load-children": "A function used when dynamically loading children. If this prop is set, then the supplied function will be run if expanding an item that has a `item-children` property that is an empty array. Supports returning a Promise.",
- "loading-icon": "Icon used when node is in a loading state",
- "multiple-active": "When `true`, allows user to have multiple active nodes at the same time",
- "off-icon": "Icon used when node is not selected",
- "on-icon": "Icon used when leaf node is selected or when a branch node is fully selected",
+ "loadChildren": "A function used when dynamically loading children. If this prop is set, then the supplied function will be run if expanding an item that has a `item-children` property that is an empty array. Supports returning a Promise.",
+ "loadingIcon": "Icon used when node is in a loading state",
+ "multipleActive": "When `true`, allows user to have multiple active nodes at the same time",
+ "offIcon": "Icon used when node is not selected",
+ "onIcon": "Icon used when leaf node is selected or when a branch node is fully selected",
"open": "Syncable prop that allows one to control which nodes are open. The array consists of the `item-key` of each open item.",
- "open-all": "When `true` will cause all branch nodes to be opened when component is mounted",
- "open-on-click": "When `true` will cause nodes to be opened by clicking anywhere on it, instead of only opening by clicking on expand icon",
+ "openAll": "When `true` will cause all branch nodes to be opened when component is mounted",
+ "openOnClick": "When `true` will cause nodes to be opened by clicking anywhere on it, instead of only opening by clicking on expand icon",
"selectable": "Will render a checkbox next to each node allowing them to be selected",
- "selected-color": "The color of the selection checkbox",
+ "selectedColor": "The color of the selection checkbox",
"transition": "Applies a transition when nodes are opened and closed",
"value": "Allows one to control which nodes are selected. The array consists of the `item-key` of each selected item. Is used with `@input` event to allow for `v-model` binding."
}
diff --git a/src/lang/en/framework/Internationalization.json b/src/lang/en/framework/Internationalization.json
index 660852e28..1ce63ec69 100644
--- a/src/lang/en/framework/Internationalization.json
+++ b/src/lang/en/framework/Internationalization.json
@@ -3,7 +3,7 @@
"headerText": "Vuetify supports language internationalization of its components. When installing Vuetify you can specify available locales and the currently active locale with the `lang` option. See the Getting started section. ",
"gettingStarted": "Getting started",
"gettingStartedText": "To set the available locales or the current locale, supply the `lang` option when installing Vuetify. The provided `locales` property will be merged with the already existing locales. You can change the locale during runtime through the `$vuetify` object on the Vue instance.",
- "availableLocalesText": "Currently Vuetify provides translations in the following languages: English (**en**), Catalan (**ca**), traditional Chinese (**zh-Hant**), simpified Chinese (**zh-Hans**), Dutch (**nl**), Farsi (**fa**), French (**fr**), German (**de**), Greek (**gr**), Polish (**pl**), Portuguese (**pt**), Russian (**ru**) and Ukrainian (**uk**).",
+ "availableLocalesText": "Currently Vuetify provides translations in the following languages: English (**en**), Catalan (**ca**), traditional Chinese (**zh-Hant**), simpified Chinese (**zh-Hans**), Dutch (**nl**), Farsi (**fa**), French (**fr**), German (**de**), Greek (**gr**), Italian (**it**), Polish (**pl**), Portuguese (**pt**), Russian (**ru**), Serbian cyrilic (**sr-Cyrl**) and Ukrainian (**uk**).",
"createTranslation": "Create translation",
"createTranslationText": "To create your own translation, use the code below or copy and rename the file `vuetify/src/locale/en.ts` to your project and make your changes.",
"customComponents": "Custom components",
diff --git a/src/lang/es-MX/components/SelectionControls.json b/src/lang/es-MX/components/SelectionControls.json
index 01528bf72..259926ea4 100644
--- a/src/lang/es-MX/components/SelectionControls.json
+++ b/src/lang/es-MX/components/SelectionControls.json
@@ -60,6 +60,10 @@
"switchesColors": {
"header": "Switches - Colors",
"desc": "Puedes cambiar el color de los switches si usas cualquiera de los colores prefabricados y los nombres contextuales en la prop `color`."
+ },
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Selection controls' labels can be defined in `label` slot - that will allow to use HTML content"
}
}
],
@@ -74,4 +78,4 @@
"inputValue": "El valor referenciado en **v-model**",
"value": "Configura el valor de la selección en el componente"
}
-}
\ No newline at end of file
+}
diff --git a/src/lang/ko/components/SelectionControls.json b/src/lang/ko/components/SelectionControls.json
index 99be27aed..4f37f1447 100644
--- a/src/lang/ko/components/SelectionControls.json
+++ b/src/lang/ko/components/SelectionControls.json
@@ -54,6 +54,10 @@
"switchesColors": {
"header": "스위치 - 색깔",
"desc": "`color` prop를 이용하면 스위치를 어떠한 내장 색(builtin colors) 이나 contextual 이름에 대응 하는 색으로 만들 수 있습니다."
+ },
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Selection controls' labels can be defined in `label` slot - that will allow to use HTML content"
}
},
"props": {
diff --git a/src/lang/ru/components/SelectionControls.json b/src/lang/ru/components/SelectionControls.json
index c3b48b548..a36955090 100644
--- a/src/lang/ru/components/SelectionControls.json
+++ b/src/lang/ru/components/SelectionControls.json
@@ -54,6 +54,10 @@
"switchesColors": {
"header": "Switches - Цвета",
"desc": "Switches можно покрасить, используя любой из встроенных цветов и контекстных имён, используя свойство `color`."
+ },
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Selection controls' labels can be defined in `label` slot - that will allow to use HTML content"
}
},
"props": {
diff --git a/src/lang/zhHans/components/SelectionControls.json b/src/lang/zhHans/components/SelectionControls.json
index 8c9df7926..3d6afe018 100644
--- a/src/lang/zhHans/components/SelectionControls.json
+++ b/src/lang/zhHans/components/SelectionControls.json
@@ -54,6 +54,10 @@
"switchesColors": {
"header": "开关 - 颜色",
"desc": "开关也可以通过 `color` 属性使用内置的颜色来设置色彩。"
+ },
+ "labelSlot": {
+ "header": "Label slot",
+ "desc": "Selection controls' labels can be defined in `label` slot - that will allow to use HTML content"
}
},
"props": {