Merge branch 'master' into dev

Author: johnleider

packages/docs/src/components/base/Comparison.vue

@@ -176,9 +176,9 @@
         {
           name: 'Quasar Framework',
           src: 'https://cdn.vuetifyjs.com/images/competitors/quasar.png',
+          components: 81,
+          tree: 'Automatic',
           release: 'Bi-Weekly',
-          components: 68,
-          tree: 'Config',
           ssr: true,
           rtl: true,
         },

packages/docs/src/components/core/SystemBar.vue

@@ -11,7 +11,7 @@
     <div class="px-6">
       <strong>Join us</strong>
 
-      &nbsp;at the upcoming VueConf Toronto to learn more about Vuetify v2.0 and more! Use&nbsp;
+      at the upcoming VueConf Toronto to learn about the future of Vuetify! Use&nbsp;
 
       <a
         href="https://vuetoronto.com/tickets"

packages/docs/src/components/getting-started/Browsers.vue

@@ -10,7 +10,7 @@
           :key="browser.title"
           cols="12"
           sm="6"
-          md="4"
+          xl="4"
         >
           <v-list-item>
             <v-list-item-avatar

packages/docs/src/components/introduction/Roadmap.vue

@@ -93,15 +93,20 @@
 <script>
   const types = {
     release: {
-      icon: 'mdi-package-variant-closed',
+      icon: 'mdi-firework',
       color: 'indigo lighten-1',
     },
     packages: {
-      icon: 'mdi-server-network',
+      icon: 'mdi-package-variant',
       color: 'red lighten-2',
       small: true,
     },
     site: {
+      icon: 'mdi-monitor-dashboard',
+      color: 'blue-grey',
+      small: true,
+    },
+    snips: {
       icon: 'mdi-content-cut',
       color: 'blue-grey',
       small: true,

packages/docs/src/lang/en/customization/Breakpoints.json

@@ -43,5 +43,5 @@
   "breakpointText1a": "You can specify custom breakpoint thresholds and scrollbar width. Keep in mind that you will still need to update the css grid breakpoints to match.",
   "breakpointText2": "Let's try a real world example. You have a `v-dialog` component that you want to convert to a **full-screen** dialog on mobile devices. Normally you would need to bind watchers for the viewport size, and/or check whenever the page loads.",
   "breakpointText3": "That's a lot of boilerplate to write. Even if you opt to use the built in [v-resize](/directives/resizing) directive, you are still going to have to define a resize method. With the **breakpoint** object you can completely skip this logic and get back to building your application.",
-  "customizeThresholdsText1": "You can define your own breakpoint threshold pixel values, but it is currently a two-step process: 1. To update the styles you will have to override the `$grid-breakpoints` stylus variables (please see [SASS variables](/customization/sass-variables)). 2. To use the same values on the javascript side of things you must pass them during the application bootstrap like so:"
+  "customizeThresholdsText1": "You can define your own breakpoint threshold pixel values, but it is currently a two-step process: 1. To update the styles you will have to override the `$grid-breakpoints` SASS variables (please see [SASS variables](/customization/sass-variables)). 2. To use the same values on the javascript side of things you must pass them during the application bootstrap like so:"
 }

packages/docs/src/lang/en/introduction/Roadmap.json

@@ -80,15 +80,15 @@
           "Converted from avoriaz to vue-test-utils"
         ],
         "#### New Components": [
-          "v-app-bar",
-          "v-banner",
-          "v-chip-group",
-          "v-color-picker",
-          "v-file-input",
-          "v-list-item-group",
-          "v-overlay",
-          "v-simple-table",
-          "v-slide-group"
+          "`v-app-bar`",
+          "`v-banner`",
+          "`v-chip-group`",
+          "`v-color-picker`",
+          "`v-file-input`",
+          "`v-list-item-group`",
+          "`v-overlay`",
+          "`v-simple-table`",
+          "`v-slide-group`"
         ]
       },
       "value": false
@@ -106,12 +106,12 @@
           "Lazy loading support for `v-img`"
         ],
         "#### New Components": [
-          "v-lazy",
-          "v-skeleton-loader"
+          "`v-lazy`",
+          "`v-skeleton-loader`"
         ],
         "#### New Directives": [
-          "v-intersect",
-          "v-mutate"
+          "`v-intersect`",
+          "`v-mutate`"
         ]
       },
       "value": false
@@ -122,6 +122,18 @@
       "title": "v2.2 Release **(Tigris)**",
       "caption": "Q4 2019",
       "text": "The introduction of Vuetify Presets. Will include the entire Material Design Studies collection and be _user customizable_. Will streamline the process for altering the default styles for the framework. Thousands of SASS variables will be added and a lookup tree for finding variables will put into the documentation. For more information on Google's studies, please [navigate here](https://material.io/design/material-studies/about-our-material-studies.html).",
+      "features": {
+        "#### Highlights": [
+          "New Components",
+          "New Directives"
+        ],
+        "#### New Components": [
+          "`v-theme-provider`"
+        ],
+        "#### New Directives": [
+          "`v-click-outside`"
+        ]
+      },
       "value": true
     },
     {
@@ -130,11 +142,87 @@
       "title": "v2.3 Release **(Orion)**",
       "caption": "Q1 2020",
       "text": "Vuetify components will be pre-configurable through framework wide defaults. This will allow you to set global settings such as **no-ripples** or all inputs are of **outlined** type and even set all cards to become **tile**s.",
+      "features": {
+        "#### Highlights": [
+          "Framework wide configuration options",
+          "New Components"
+        ],
+        "#### New Components": [
+          "`v-chronology`",
+          "`v-empty-state`",
+          "`v-feature-discovery`",
+          "`v-no-ssr`"
+        ]
+      },
+      "value": false
+    },
+    {
+      "type": "packages",
+      "complete": false,
+      "title": "Vuetify Ecosystem Suite",
+      "caption": "Q1 2020",
+      "text": "Brand new development tools designed to improve your productivity and efficiency while working with Vuetify. These features were first discussed at [Vue Conf Toronto in 2018](https://www.vuemastery.com/conferences/vueconf-toronto-2018/Vuetify-the-path-to-2-0) and officially shown at Vue Conf Toronto in 2019 (video coming soon).",
+      "features": {
+        "#### New Packages": [
+          "Vuetify CLI",
+          "Vuetify Storybook",
+          "Vuetify Preset"
+        ]
+      },
+      "value": false
+    },
+    {
+      "type": "release",
+      "complete": false,
+      "title": "v2.4 Release **(Odyssey)**",
+      "caption": "Q2 2020",
+      "text": "A maintenance cycle to raise framework coverage above 95%. The focus will be to continue to harden the framework while adding new features and functionality.",
+      "features": {
+        "#### Highlights": [
+          "`v-stepper` rewrite",
+          "`v-parallax` rewrite",
+          "New Components",
+          "Updated Components"
+        ],
+        "#### New Components": [
+          "`v-file-upload`",
+          "`v-number-input`",
+          "`v-video`"
+        ],
+        "#### Updated Components": [
+          "`v-parallax`",
+          "`v-stepper`"
+        ]
+      },
       "value": false
     },
     {
       "type": "site",
       "complete": false,
+      "title": "Theme Generator",
+      "caption": "Q2 2020",
+      "text": "A complete theme generator for easily creating customized presets for your application.",
+      "value": false
+    },
+    {
+      "type": "release",
+      "complete": false,
+      "title": "v2.5 Release **(Serenity)**",
+      "caption": "Q3 2020",
+      "text": "**(In planning)** More release information coming soon.",
+      "features": {
+        "#### Highlights": [
+          "New Components"
+        ],
+        "#### New Components": [
+          "`v-lightbox`"
+        ]
+      },
+      "value": false
+    },
+    {
+      "type": "snips",
+      "complete": false,
       "title": "Vuetify Snips",
       "caption": "TBD",
       "text": "Website dedicated to creating and sharing Vuetify snippets.",

packages/docs/src/lang/en/professional-support/Business.json

@@ -2,9 +2,9 @@
   "heading": "# Vuetify for business",
   "headingText": "Get professional support from the creator, John Leider, while you help Open Source Software. Vuetify offers 3 tiers that are designed to provide businesses with consulting, dedicated chat support and Github issue prioritization.",
   "premiereHeading": "## Premiere sponsor",
-  "premiereText": "Get professional support from the creator, [John Leider](https://github.com/johnleider), while you help Open Source Software. Vuetify offers 3 tiers that are designed to provide businesses with consulting, dedicated chat support and Github issue prioritization.",
+  "premiereText": "Get professional support from the creator, [John Leider](https://github.com/johnleider), while you help Open Source Software. Vuetify offers 3 tiers that are designed to provide businesses with consulting, dedicated chat support and Github issue prioritization. This package provides **Three (3)** hours per month of live support.",
   "diamondHeading": "## Diamond sponsor",
-  "diamondText": "Become an elite sponsor of Vuetify and promote your brand while supporting the maintanence of the framework. Your logo will be on the Home Page, the Backers page, the repository README and within the documentation navigation drawer. This package provides **Three (3)** hours per month of live support.",
+  "diamondText": "Become an elite sponsor of Vuetify and promote your brand while supporting the maintanence of the framework. Your logo will be on the Home Page, the Backers page, the repository README and within the documentation navigation drawer. This package provides **Two (2)** hours per month of live support.",
   "platinumHeading": "## Platinum sponsor",
   "platinumText": "This tier is targeted at smaller shops with all the benefits of premium support, live training and Github issue prioritization. This package includes **One (1)** hour per month of live support.",
   "customText": "Looking for a customized support plan? Please email all questions to [[email protected]](mailto:[email protected]?subject=Sponsorship%20Question)",

packages/docs/src/lang/en/styles/Colors.json

@@ -1,6 +1,6 @@
 {
   "heading": "# Colors",
-  "headingText": "Out of the box you get access to all colors in the [Material Design spec](https://material.io/guidelines/style/color.html) through **stylus** and **javascript**. These values can be used within your style sheets, your component files and on actual components via the **color class** system.",
+  "headingText": "Out of the box you get access to all colors in the [Material Design spec](https://material.io/guidelines/style/color.html) through **sass** and **javascript**. These values can be used within your style sheets, your component files and on actual components via the **color class** system.",
   "classesHeader": "## Classes",
   "classesText": "Each color from the spec gets converted to a **background** and **text** variant for styling within your application through a class, e.g. `<div class=\"red\">` or `<span class=\"red--text\">`. These class colors are defined [here](https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/styles/settings/_colors.scss).",
   "classesText2": "Text colors also support **darken** and **lighten** variants using `text--{lighten|darken}-{n}`",

packages/docs/src/layouts/layouts/demos/google-contacts.vue

@@ -93,7 +93,7 @@
         flat
         solo-inverted
         hide-details
-        prepend-inner-icon="search"
+        prepend-inner-icon="mdi-magnify"
         label="Search"
         class="hidden-sm-and-down"
       />
@@ -260,21 +260,21 @@
       dialog: false,
       drawer: null,
       items: [
-        { icon: 'contacts', text: 'Contacts' },
-        { icon: 'history', text: 'Frequently contacted' },
-        { icon: 'content_copy', text: 'Duplicates' },
+        { icon: 'mdi-contacts', text: 'Contacts' },
+        { icon: 'mdi-history', text: 'Frequently contacted' },
+        { icon: 'mdi-content-copy', text: 'Duplicates' },
         {
-          icon: 'keyboard_arrow_up',
-          'icon-alt': 'keyboard_arrow_down',
+          icon: 'mdi-chevron-up',
+          'icon-alt': 'mdi-chevron-down',
           text: 'Labels',
           model: true,
           children: [
-            { icon: 'add', text: 'Create label' },
+            { icon: 'mdi-plus', text: 'Create label' },
           ],
         },
         {
-          icon: 'keyboard_arrow_up',
-          'icon-alt': 'keyboard_arrow_down',
+          icon: 'mdi-chevron-up',
+          'icon-alt': 'mdi-chevron-down',
           text: 'More',
           model: false,
           children: [
@@ -285,11 +285,11 @@
             { text: 'Other contacts' },
           ],
         },
-        { icon: 'settings', text: 'Settings' },
-        { icon: 'chat_bubble', text: 'Send feedback' },
-        { icon: 'help', text: 'Help' },
-        { icon: 'phonelink', text: 'App downloads' },
-        { icon: 'keyboard', text: 'Go to the old version' },
+        { icon: 'mdi-settings', text: 'Settings' },
+        { icon: 'mdi-message', text: 'Send feedback' },
+        { icon: 'mdi-help-circle', text: 'Help' },
+        { icon: 'mdi-cellphone-link', text: 'App downloads' },
+        { icon: 'mdi-keyboard', text: 'Go to the old version' },
       ],
     }),
   }

packages/docs/src/snippets/ts/create_translation.txt

@@ -12,6 +12,7 @@ export default {
       sortAscending: ': Sorted ascending. Activate to sort descending.',
       sortNone: ': Not sorted. Activate to sort ascending.',
     },
+    sortBy: 'Sort by',
   },
   dataFooter: {
     itemsPerPageText: 'Items per page:',