Merge branch 'dev' of github.com:quasarframework/quasar into dev

quasarframework · Nov 13, 2021 · 691e11e · 691e11e
2 parents d9dd53b + 6ef2bb5
commit 691e11e
Show file tree

Hide file tree

Showing 36 changed files with 4,620 additions and 37 deletions.
diff --git a/.github/RELEASE-TEMPLATE.md b/.github/RELEASE-TEMPLATE.md
@@ -0,0 +1,18 @@
+# Quasar v2.x.x
+
+## What's Changed
+
+**Features:**
+
+**Fixes:**
+
+## Documentation
+
+The documentation can be found at [quasar.dev](https://quasar.dev/)
+
+## Donations
+
+Quasar Framework is an open-source MIT licensed project that has been made possible due to the **generous contributions** by [sponsors and backers](https://github.com/sponsors/rstoenescu). If you are interested in supporting this project, please consider:
+
+- [Becoming a sponsor on Github](https://github.com/sponsors/rstoenescu)
+- [One-off donation via PayPal](https://paypal.me/rstoenescu1)
diff --git a/docs/src/components/page-parts/sponsors-and-backers/DonatingButtons.vue b/docs/src/components/page-parts/sponsors-and-backers/DonatingButtons.vue
@@ -19,10 +19,7 @@
       </div>
     </q-btn>
 
-    <form class="inline-block" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank" rel="noopener">
-      <input type="hidden" name="cmd" value="_s-xclick">
-      <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
-      ">
+    <form class="inline-block" action="https://www.paypal.me/rstoenescu1" method="post" target="_blank" rel="noopener">
       <q-btn
         push
         color="secondary"

diff --git a/docs/src/components/page-parts/umd/UmdTags.vue b/docs/src/components/page-parts/umd/UmdTags.vue
@@ -14,7 +14,6 @@ q-card(flat bordered)
 
     q-toggle(v-model="css['mdi-v6']" label="MDI v6")
     q-toggle(v-model="css['fontawesome-v5']" label="Fontawesome v5")
-    q-toggle(v-model="css['ionicons-v5']" label="Ionicons v5")
     q-toggle(v-model="css['ionicons-v4']" label="Ionicons v4")
     q-toggle(v-model="css['eva-icons']" label="Eva Icons")
     q-toggle(v-model="css.themify" label="Themify")
@@ -71,7 +70,6 @@ import languages from 'quasar/lang/index.json'
 const cssMap = {
   'mdi-v6': 'cdn.jsdelivr.net/npm/@mdi/font@^6.0.0/css/materialdesignicons.min.css',
   'fontawesome-v5': 'use.fontawesome.com/releases/v5.0.13/css/all.css',
-  'ionicons-v5': 'cdn.jsdelivr.net/npm/ionicons@^5.0.0/dist/css/ionicons.min.css',
   'ionicons-v4': 'cdn.jsdelivr.net/npm/ionicons@^4.0.0/dist/css/ionicons.min.css',
   'eva-icons': 'cdn.jsdelivr.net/npm/eva-icons@^1.0.0/style/eva-icons.css',
   themify: 'themify.me/wp-content/themes/themify-v32/themify-icons/themify-icons.css',
@@ -106,7 +104,6 @@ export default {
 
       'mdi-v6': false,
       'fontawesome-v5': false,
-      'ionicons-v5': false,
       'ionicons-v4': false,
       'eva-icons': false,
       themify: false,
@@ -271,7 +268,7 @@ export default {
         { label: 'Material Sharp (webfont)', value: 'material-icons-sharp' },
         { label: 'MDI v6 (webfont)', value: 'mdi-v6' },
         { label: 'MDI v6 (svg)', value: 'svg-mdi-v6' },
-        { label: 'Ionicons v5 (webfont)', value: 'ionicons-v5' },
+        { label: 'Ionicons v6 (svg)', value: 'svg-ionicons-v6' },
         { label: 'Ionicons v5 (svg)', value: 'svg-ionicons-v5' },
         { label: 'Ionicons v4 (webfont)', value: 'ionicons-v4' },
         { label: 'Ionicons v4 (svg)', value: 'svg-ionicons-v4' },

diff --git a/docs/src/components/page-parts/vite-plugin/VitePluginUsage.vue b/docs/src/components/page-parts/vite-plugin/VitePluginUsage.vue
@@ -15,7 +15,6 @@ q-card(flat bordered)
 
     q-toggle(v-model="css['mdi-v6']" label="MDI v6")
     q-toggle(v-model="css['fontawesome-v5']" label="Fontawesome v5")
-    q-toggle(v-model="css['ionicons-v5']" label="Ionicons v5")
     q-toggle(v-model="css['ionicons-v4']" label="Ionicons v4")
     q-toggle(v-model="css['eva-icons']" label="Eva Icons")
     q-toggle(v-model="css.themify" label="Themify")
@@ -96,7 +95,6 @@ const extrasOptions = [
   'material-icons-sharp',
   'mdi-v6',
   'fontawesome-v5',
-  'ionicons-v5',
   'ionicons-v4',
   'eva-icons',
   'themify',
@@ -121,7 +119,6 @@ export default {
 
       'mdi-v6': false,
       'fontawesome-v5': false,
-      'ionicons-v5': false,
       'ionicons-v4': false,
       'eva-icons': false,
       themify: false,
@@ -309,7 +306,7 @@ $warning   : #F2C037
         { label: 'Material Sharp (webfont)', value: 'material-icons-sharp' },
         { label: 'MDI v6 (webfont)', value: 'mdi-v6' },
         { label: 'MDI v6 (svg)', value: 'svg-mdi-v6' },
-        { label: 'Ionicons v5 (webfont)', value: 'ionicons-v5' },
+        { label: 'Ionicons v6 (svg)', value: 'svg-ionicons-v6' },
         { label: 'Ionicons v5 (svg)', value: 'svg-ionicons-v5' },
         { label: 'Ionicons v4 (webfont)', value: 'ionicons-v4' },
         { label: 'Ionicons v4 (svg)', value: 'svg-ionicons-v4' },

diff --git a/docs/src/pages/options/installing-icon-libraries.md b/docs/src/pages/options/installing-icon-libraries.md
@@ -34,7 +34,7 @@ Adding more than one set:
 extras: [
   'material-icons',
   'mdi-v6',
-  'ionicons-v5',
+  'ionicons-v4', // last webfont was available in v4.6.3
   'eva-icons',
   'fontawesome-v5',
   'themify',

diff --git a/docs/src/pages/vue-components/icon.md b/docs/src/pages/vue-components/icon.md
@@ -56,7 +56,7 @@ If you are using webfont-based icons, make sure that you [installed the icon lib
 | material-icons-round | r_ | r_thumb_up | Notice the underline character instead of dash or space |
 | material-icons-sharp | s_ | s_thumb_up | Notice the underline character instead of dash or space |
 | ionicons-v4 | ion-, ion-md-, ion-ios-, ion-logo- | ion-heart, ion-logo-npm, ion-md-airplane | Use QIcon instead of `<ion-icon>` component; Logo icons require 'ion-logo-' prefix |
-| ionicons-v5 | ion- | ion-heart, ion-logo-npm, ion-airplane | Use QIcon instead of `<ion-icon>` component; Logo icons require 'ion-logo-' prefix |
+| ionicons-v5/v6 | ion- | ion-heart, ion-logo-npm, ion-airplane | Use QIcon instead of `<ion-icon>` component; Logo icons require 'ion-logo-' prefix |
 | fontawesome-v5 | fa[s,r,l,d,b] fa- | "fas fa-ambulance" | QIcon "name" property is same as "class" attribute value in Fontawesome docs examples (where they show `<i>` tags) |
 | mdi-v6/v5/v4/v3 | mdi- | mdi-alert-circle-outline | Notice the use of dash characters; Use only one of mdi-v6, mdi-v5, mdi-v4 or mdi-v3 |
 | eva-icons | eva- | eva-shield-outline, eva-activity-outline | Notice the use of dash characters |
@@ -84,7 +84,8 @@ If you are using webfont-based icons, make sure that you [installed the icon lib
 #### Ionicons
 
 * Icon names are in hyphen-separated case and always begin with "ion-", "ion-md-", "ion-ios-" or "ion-logo-" prefixes.
-* Go to [Ionicons](https://ionicons.com/v4), look for your desired icon, click on it. At the bottom of the page there will appear a popup. Notice something like `<ion-icon name="square-outline"></ion-icon>`. Remember the name (eg. "square-outline"). Based on the variant that you want (auto-detect platform, material or iOS), you'd get the result: `ion-square-outline` or `ion-md-square-outline` or `ion-ios-square-outline`.
+* Go to [Ionicons (v6)](https://ionicons.com/) or [Ionicons (v4)](https://ionicons.com/v4), look for your desired icon, click on it. At the bottom of the page there will appear a popup. Notice something like `<ion-icon name="square-outline"></ion-icon>`. Remember the name (eg. "square-outline"). Based on the variant that you want (auto-detect platform, material or iOS), you'd get the result: `ion-square-outline` or `ion-md-square-outline` or `ion-ios-square-outline`.
+* **Note:** Starting with v5, Ionicons no longer supplies a webfont. Also,they no longer do Material or IOS variants.
 
 #### Eva Icons
 
@@ -156,6 +157,7 @@ If you are only using svg icons (and have configured a [Quasar Icon Set](/option
 | MDI (Material Design Icons) (v3-v5) | svg-mdi-v5 | @quasar/extras/mdi-v5 | |
 | MDI (Material Design Icons) v6 | svg-mdi-v6 | @quasar/extras/mdi-v6 | @quasar/extras v1.11+ |
 | Font Awesome | svg-fontawesome-v5 | @quasar/extras/fontawesome-v5 | |
+| Ionicons v6 | svg-ionicons-v6 | @quasar/extras/ionicons-v6 | @quasar/extras v1.12+ |
 | Ionicons v5 | svg-ionicons-v5 | @quasar/extras/ionicons-v5 | @quasar/extras v1.7+ |
 | Ionicons v4 | svg-ionicons-v4 | @quasar/extras/ionicons-v4 | |
 | Eva Icons | svg-eva-icons | @quasar/extras/eva-icons | |
@@ -207,11 +209,11 @@ Svg icons are supplied by `@quasar/extras` (although you can supply [your own sv
 #### SVG Ionicons
 
 * Ionicons v4: Icon names are in camel-case and always begin with "ionMd" or "ionIos" prefixes.
-* Ionicons v5: Icon names are in camel-case and always begin with "ion" prefix.
+* Ionicons v5/v6: Icon names are in camel-case and always begin with "ion" prefix.
 * Ionicons v4: Go to [Ionicons v4](https://ionicons.com/v4/), look for your desired icon, click on it. At the bottom of the page there will appear a popup. Notice something like `<ion-icon name="square-outline"></ion-icon>`. Remember the name (eg. "square-outline"). Camel-case this name and prefix it with either "ionMd" (for material variant) or "ionIos" (for iOS variant).
-* Ionicons v5:Go to [Ionicons v5](https://ionicons.com/), look for your desired icon, click on it. At the bottom of the page there will appear a popup. Notice something like `<ion-icon name="square-outline"></ion-icon>`. Remember the name (eg. "square-outline"). Prefix it with "ion" and camel-case the result (eg. "ionSquareOutline").
+* Ionicons v5/v6: Go to [Ionicons v6](https://ionicons.com/), look for your desired icon, click on it. At the bottom of the page there will appear a popup. Notice something like `<ion-icon name="square-outline"></ion-icon>`. Remember the name (eg. "square-outline"). Prefix it with "ion" and camel-case the result (eg. "ionSquareOutline").
 * Ionicons v4: Import statement example: `import { ionMdSquareOutline } from '@quasar/extras/ionicons-v4'`.
-* Ionicons v5: Import statement example: `import { ionSquareOutline } from '@quasar/extras/ionicons-v5'`.
+* Ionicons v5/v6: Import statement example: `import { ionSquareOutline } from '@quasar/extras/ionicons-v5'`.
 
 #### SVG Eva Icons
 

diff --git a/extras/README.md b/extras/README.md
@@ -23,10 +23,10 @@ Please make sure you have latest `@quasar/extras` npm package version installed
 | --- | --- | --- | --- | --- | --- |
 | Roboto Font | CDN v29 | `roboto-font` | Recommended font along Material theme | | [License](roboto-font/LICENSE) |
 | Roboto Font Latin Extended | CDN v29 | `roboto-font-latin-ext` | Recommended font along Material theme | | [License](roboto-font-latin-ext/LICENSE) |
-| [Material Icons](https://material.io/tools/icons/?style=baseline) (Google) | CDN v114 | `material-icons` | Material icons font | Requires: @quasar/extras 1.2.0+ | [License](material-icons/LICENSE) |
-| [Material Icons Outlined](https://material.io/tools/icons/?style=outline) | CDN v88 | `material-icons-outlined` | Material icons outlined font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-outlined/LICENSE) |
-| [Material Icons Round](https://material.io/tools/icons/?style=round) | CDN v87 | `material-icons-round` | Material icons round font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-round/LICENSE) |
-| [Material Icons Sharp](https://material.io/tools/icons/?style=sharp) | CDN v88 | `material-icons-sharp` | Material icons sharp font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-sharp/LICENSE) |
+| [Material Icons](https://material.io/tools/icons/?style=baseline) (Google) | CDN v115 | `material-icons` | Material icons font | Requires: @quasar/extras 1.2.0+ | [License](material-icons/LICENSE) |
+| [Material Icons Outlined](https://material.io/tools/icons/?style=outline) | CDN v90 | `material-icons-outlined` | Material icons outlined font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-outlined/LICENSE) |
+| [Material Icons Round](https://material.io/tools/icons/?style=round) | CDN v89 | `material-icons-round` | Material icons round font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-round/LICENSE) |
+| [Material Icons Sharp](https://material.io/tools/icons/?style=sharp) | CDN v90 | `material-icons-sharp` | Material icons sharp font | Requires: @quasar/extras 1.2.0+ | [License](material-icons-sharp/LICENSE) |
 | [MDI v6](https://materialdesignicons.com/) (Material Design Icons) | 6.4.95 | `mdi-v6` | Extended Material Design icons font |  | [License](mdi-v5/LICENSE) |
 | [MDI v5](https://materialdesignicons.com/) (Material Design Icons) | 5.9.55 | `mdi-v5` | Extended Material Design icons font |  | [License](mdi-v5/LICENSE) |
 | MDI v4 (Material Design Icons) | 4.9.95 | `mdi-v4` | Extended Material Design icons font | | [License](mdi-v4/license.md) |
@@ -48,14 +48,15 @@ Please make sure you have latest `@quasar/extras` npm package version installed
 
 | Vendor | Version | Quasar IconSet name | Import Icons from | Notes | License |
 | --- | --- | --- | --- | --- | --- |
-| [Material Icons](https://material.io/tools/icons/?style=baseline) (Google) | CDN v114 | `svg-material-icons` | `@quasar/extras/material-icons` | | [License](material-icons/LICENSE) |
-| [Material Icons Outlined](https://material.io/tools/icons/?style=outlined) (Google) | CDN v88 | `svg-material-icons-outlined` | `@quasar/extras/material-icons-outlined` | Requires: @quasar/extras 1.9+ | [License](material-icons-outlined/LICENSE) |
-| [Material Icons Round](https://material.io/tools/icons/?style=round) (Google) | CDN v87 | `svg-material-icons-round` | `@quasar/extras/material-icons-round` | Requires: @quasar/extras 1.9+ | [License](material-icons-round/LICENSE) |
-| [Material Icons Sharp](https://material.io/tools/icons/?style=sharp) (Google) | CDN v88 | `svg-material-icons-sharp` | `@quasar/extras/material-icons-sharp` | Requires: @quasar/extras 1.9+ | [License](material-icons-sharp/LICENSE) |
+| [Material Icons](https://material.io/tools/icons/?style=baseline) (Google) | CDN v115 | `svg-material-icons` | `@quasar/extras/material-icons` | | [License](material-icons/LICENSE) |
+| [Material Icons Outlined](https://material.io/tools/icons/?style=outlined) (Google) | CDN v90 | `svg-material-icons-outlined` | `@quasar/extras/material-icons-outlined` | Requires: @quasar/extras 1.9+ | [License](material-icons-outlined/LICENSE) |
+| [Material Icons Round](https://material.io/tools/icons/?style=round) (Google) | CDN v89 | `svg-material-icons-round` | `@quasar/extras/material-icons-round` | Requires: @quasar/extras 1.9+ | [License](material-icons-round/LICENSE) |
+| [Material Icons Sharp](https://material.io/tools/icons/?style=sharp) (Google) | CDN v90 | `svg-material-icons-sharp` | `@quasar/extras/material-icons-sharp` | Requires: @quasar/extras 1.9+ | [License](material-icons-sharp/LICENSE) |
 | [MDI v6](https://materialdesignicons.com/) (Material Design Icons) | 6.4.95 | `svg-mdi-v6` | `@quasar/extras/mdi-v6` | | [License](mdi-v6/LICENSE) |
 | [MDI v5](https://materialdesignicons.com/) (Material Design Icons) | 5.9.55 | `svg-mdi-v5` | `@quasar/extras/mdi-v5` | | [License](mdi-v5/LICENSE) |
 | MDI v4 (Material Design Icons) | 4.9.95 | `svg-mdi-v4` | `@quasar/extras/mdi-v4` | | [License](mdi-v4/license.md) |
 | [Font Awesome](https://fontawesome.com/icons?d=gallery) | 5.15.4 | `svg-fontawesome-v5` | `@quasar/extras/fontawesome-v5` | | [License](fontawesome-v5/LICENSE.txt) |
+| [Ionicons v6](https://ionicons.com/) | 6.0.0 | `svg-ionicons-v6` | `@quasar/extras/ionicons-v6` | Requires: @quasar/extras 1.12+ | [Icon License](ionicons-v6/LICENSE) |
 | [Ionicons v5](https://ionicons.com/) | 5.5.4 | `svg-ionicons-v5` | `@quasar/extras/ionicons-v5` | Requires: @quasar/extras 1.7+ | [Icon License](ionicons-v5/LICENSE) |
 | [Ionicons v4](https://ionicons.com/v4/) | 4.6.3 | `svg-ionicons-v4` | `@quasar/extras/ionicons-v4` | No icon font (woof)  files for Ionicons since v4.6.3 | [Icon License](ionicons-v4/LICENSE) |
 | [Eva Icons](https://akveo.github.io/eva-icons) | 1.1.3 | `svg-eva-icons` | `@quasar/extras/eva-icons` | | [License](eva-icons/LICENSE) |