diff --git a/docs/build/markdown.js b/docs/build/markdown.js index e2f3fae..0884f62 100644 --- a/docs/build/markdown.js +++ b/docs/build/markdown.js @@ -42,7 +42,7 @@ function highlight (str, lang) { const code = Prism.highlight(str, Prism.languages[ lang ], lang) return '
'
-      + `${ code }
\n` + + `${ code }\n` } return '' diff --git a/docs/quasar.conf.js b/docs/quasar.conf.js index 878b00e..36d432b 100644 --- a/docs/quasar.conf.js +++ b/docs/quasar.conf.js @@ -28,8 +28,7 @@ module.exports = configure(function (ctx) { // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: [ - 'app.sass', - 'Markdown.sass' + 'app.sass' ], // https://github.com/quasarframework/quasar/tree/dev/extras diff --git a/docs/src/components/DocsMenu.js b/docs/src/components/DocsMenu.js index 2139443..d6a7f90 100644 --- a/docs/src/components/DocsMenu.js +++ b/docs/src/components/DocsMenu.js @@ -8,7 +8,6 @@ import { Ripple } from 'quasar' -// import { mdiArrowDownThinCircleOutline } from '@quasar/extras/mdi-v5' import { biCaretDown, biCaretDownFill } from '@quasar/extras/bootstrap-icons' import { h, ref, watch, onMounted, onBeforeUpdate, withDirectives } from 'vue' import { useRoute } from 'vue-router' diff --git a/docs/src/components/MarkdownPage.vue b/docs/src/components/MarkdownPage.vue index db0c3f5..37745d4 100644 --- a/docs/src/components/MarkdownPage.vue +++ b/docs/src/components/MarkdownPage.vue @@ -6,51 +6,53 @@ :nav="nav" /> - - -
-
Related
- -
- -
-
-
{{ link.category || 'Docs' }}
-
{{ link.name }}
+
+ + +
+
Related
+ +
+ +
+
+
{{ link.category || 'Docs' }}
+
{{ link.name }}
+
+
- -
- + +
-
-
- -
-
- Found an error on this page or feel it could be improved? - -   Edit this page on GitHub - +
+ +
+
+ Found an error on this page or feel it could be improved? + +   Edit this page on GitHub + +
-
- + -
- - Deploys by Netlify - -
+
+ + Deploys by Netlify + +
+
diff --git a/docs/src/components/page-parts/releases/PackageReleases.vue b/docs/src/components/page-parts/releases/PackageReleases.vue index a6f5c01..da7c026 100644 --- a/docs/src/components/page-parts/releases/PackageReleases.vue +++ b/docs/src/components/page-parts/releases/PackageReleases.vue @@ -38,13 +38,13 @@ import sanitize from './sanitize' import parseMdTable from './md-table-parser' export default { - props: [ 'active', 'releases' ], + props: [ 'latestVersion', 'releases' ], setup (props) { const search = ref('') - const selectedVersion = ref(props.active) + const selectedVersion = ref(props.latestVersion) - watch(() => props.active, val => { + watch(() => props.latestVersion, val => { selectedVersion.value = val }) @@ -75,7 +75,7 @@ export default { .replace(/# ([\S ]+)/g, '
$1
') .replace(/\*\*([\S ]*?)\*\*/g, '$1') .replace(/\*([\S ]*?)\*/g, '$1') - .replace(/```([\S]+)/g, '') + .replace(/```([\S]+)/g, '') .replace(/```\n/g, '') .replace(/\`(.*?)\`/g, '$1') .replace(/#([\d]+)/g, '#$1') @@ -84,6 +84,7 @@ export default { .replace(/^ {2}[-*] ([\S .]+)$/gm, '
  • $1
    • ') .replace(/^[-*] ([\S .]+)$/gm, '
  • $1
    • ') .replace(/<\/li>[\s\n\r]*
  • ') return content.indexOf('| -') > -1 ? parseMdTable(content) diff --git a/docs/src/components/page-parts/releases/QIconPickerReleases.vue b/docs/src/components/page-parts/releases/Releases.vue similarity index 96% rename from docs/src/components/page-parts/releases/QIconPickerReleases.vue rename to docs/src/components/page-parts/releases/Releases.vue index fe708c8..3760f4d 100644 --- a/docs/src/components/page-parts/releases/QIconPickerReleases.vue +++ b/docs/src/components/page-parts/releases/Releases.vue @@ -16,7 +16,7 @@ - + @@ -32,7 +32,7 @@ import PackageReleases from './PackageReleases' const { extractDate, formatDate } = date export default { - name: 'QIconPickerReleases', + name: 'Releases', components: { PackageReleases diff --git a/docs/src/css/app.sass b/docs/src/css/app.sass index 5e938cf..d4e4051 100644 --- a/docs/src/css/app.sass +++ b/docs/src/css/app.sass @@ -1,7 +1,6 @@ -// @import 'quasar/src/css/variables.sass' -@import './quasar.variables.sass' -@import './Markdown.sass' +@import 'quasar/src/css/variables.sass' +@import 'markdown.sass' @import 'quasar-ui-example-viewer/src/index.sass' @import 'quasar-ui-json-api-viewer/src/index.sass' diff --git a/docs/src/css/Markdown.sass b/docs/src/css/markdown.sass similarity index 95% rename from docs/src/css/Markdown.sass rename to docs/src/css/markdown.sass index abbadcd..8777d0c 100644 --- a/docs/src/css/Markdown.sass +++ b/docs/src/css/markdown.sass @@ -261,6 +261,10 @@ &--code__inner margin: 0 position: relative + font-size: 12px + color: $grey-10 + background-color: $blue-grey-1 + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace text-align: left white-space: pre word-spacing: normal @@ -269,21 +273,28 @@ line-height: 1.5 tab-size: 4 hyphens: none - border-radius: $generic-border-radius - background: $blue-grey-1 - color: $grey-10 - &--code overflow: visible padding: 0 + border-radius: $generic-border-radius &__inner + background-color: $grey-2 max-height: inherit height: inherit + padding: 1em display: block overflow: auto + &--prerendered + border-width: 1px 4px + border-style: solid + border-color: $separator-color + border-left-color: $primary + border-right-color: $primary + border-radius: $generic-border-radius + &--table border-color: $grey-4 background: $grey-1 diff --git a/docs/src/pages/all-about-qiconpicker/installation-types.md b/docs/src/pages/all-about-qiconpicker/installation-types.md index a7c4e0d..4a520ee 100644 --- a/docs/src/pages/all-about-qiconpicker/installation-types.md +++ b/docs/src/pages/all-about-qiconpicker/installation-types.md @@ -125,7 +125,7 @@ import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v4.umd.js' import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v5.umd.js' import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v6.umd.js' import '@quasar/quasar-ui-qiconpicker/dist/icon-set/themify.umd.js' -import '@quasar/quasar-ui-qiconpicker/dist/icon-set/lineawesome.umd.js' +import '@quasar/quasar-ui-qiconpicker/dist/icon-set/line-awesome.umd.js' import '@quasar/quasar-ui-qiconpicker/dist/icon-set/bootstrap-icons.umd.js' export default { name: 'App' @@ -224,7 +224,7 @@ Choices are: 7. material-icons.umd.js 8. mdi-v4.umd.js 9. mdi-v5.umd.js -10. mdi-v5.umd.js +10. mdi-v6.umd.js 11. themify.umd.js 12. line-awesome.umd.js 13. bootstrap-icons.umd.js diff --git a/docs/src/pages/all-about-qiconpicker/what-is-qiconpicker.md b/docs/src/pages/all-about-qiconpicker/what-is-qiconpicker.md index 55dd431..2ab9fd6 100644 --- a/docs/src/pages/all-about-qiconpicker/what-is-qiconpicker.md +++ b/docs/src/pages/all-about-qiconpicker/what-is-qiconpicker.md @@ -38,6 +38,7 @@ QIconPicker is an icon picker for your Quasar application. It allows you to have - mdi-v5 - mdi-v6 - fontawesome-v5 + - line-awesome - eva-icons - themify - bootstrap-icons diff --git a/docs/src/pages/latest-news/changelog.md b/docs/src/pages/latest-news/changelog.md index a70c4ce..fa6073e 100644 --- a/docs/src/pages/latest-news/changelog.md +++ b/docs/src/pages/latest-news/changelog.md @@ -3,6 +3,6 @@ title: Changelog desc: The latest QIconPicker releases keys: latest-news components: - - releases/QIconPickerReleases + - releases/Releases --- - + diff --git a/ui/README.md b/ui/README.md index 49b2a87..088c597 100644 --- a/ui/README.md +++ b/ui/README.md @@ -87,6 +87,7 @@ You can do this by adding to your **App.vue** (or, any other appropriate) file: