From 52a31ea8c324cd9fbf11154967114eb7017155cf Mon Sep 17 00:00:00 2001 From: jrking4 Date: Fri, 6 Sep 2024 10:09:04 -0400 Subject: [PATCH 1/2] add background size property to uploader component --- ui/src/components/uploader/QUploader.json | 8 ++++++++ ui/src/components/uploader/uploader-core.js | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ui/src/components/uploader/QUploader.json b/ui/src/components/uploader/QUploader.json index 0263b280135..367ca331cf4 100644 --- a/ui/src/components/uploader/QUploader.json +++ b/ui/src/components/uploader/QUploader.json @@ -55,6 +55,14 @@ "category": "behavior" }, + "background-size": { + "type": "String", + "desc": "How the thumbnail image will fit into the container; Equivalent of the background-size prop;", + "default": "'cover'", + "examples": [ "'cover'", "'contain'", "'auto'", "'50%'" ], + "category": "style" + }, + "disable": { "extends": "disable" }, diff --git a/ui/src/components/uploader/uploader-core.js b/ui/src/components/uploader/uploader-core.js index 42394104afd..fb281d744f4 100644 --- a/ui/src/components/uploader/uploader-core.js +++ b/ui/src/components/uploader/uploader-core.js @@ -34,7 +34,10 @@ export const coreProps = { noThumbnails: Boolean, autoUpload: Boolean, hideUploadBtn: Boolean, - + backgroundSize: { + type: String, + default: 'cover' + }, disable: Boolean, readonly: Boolean } @@ -389,7 +392,7 @@ export function getRenderer (getPlugin, expose) { : (file.__status === 'uploaded' ? ' q-uploader__file--uploaded' : '') ), style: props.noThumbnails !== true && file.__img !== void 0 - ? { backgroundImage: 'url("' + file.__img.src + '")' } + ? { backgroundImage: 'url("' + file.__img.src + '")', backgroundSize: props.backgroundSize } : null }, [ h('div', { From 3109e5b3c6caf19a053ce578618381192b5ea617 Mon Sep 17 00:00:00 2001 From: jrking4 Date: Mon, 9 Sep 2024 13:43:18 -0400 Subject: [PATCH 2/2] add dense property to QCard --- ui/src/components/card/QCard.js | 2 ++ ui/src/components/card/QCard.json | 4 ++++ ui/src/components/card/QCard.sass | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ui/src/components/card/QCard.js b/ui/src/components/card/QCard.js index a1f002c0cee..0767827a5b3 100644 --- a/ui/src/components/card/QCard.js +++ b/ui/src/components/card/QCard.js @@ -16,6 +16,7 @@ export default createComponent({ default: 'div' }, + dense: Boolean, square: Boolean, flat: Boolean, bordered: Boolean @@ -28,6 +29,7 @@ export default createComponent({ const classes = computed(() => 'q-card' + (isDark.value === true ? ' q-card--dark q-dark' : '') + + (props.dense === true ? ' q-card--dense' : '') + (props.bordered === true ? ' q-card--bordered' : '') + (props.square === true ? ' q-card--square no-border-radius' : '') + (props.flat === true ? ' q-card--flat no-shadow' : '') diff --git a/ui/src/components/card/QCard.json b/ui/src/components/card/QCard.json index a7b48dc1f1b..e03e7a64c79 100644 --- a/ui/src/components/card/QCard.json +++ b/ui/src/components/card/QCard.json @@ -20,6 +20,10 @@ "extends": "bordered" }, + "dense": { + "extends": "dense" + }, + "tag": { "extends": "tag", "default": "'div'", diff --git a/ui/src/components/card/QCard.sass b/ui/src/components/card/QCard.sass index 19c831833c4..5988a80dcb3 100644 --- a/ui/src/components/card/QCard.sass +++ b/ui/src/components/card/QCard.sass @@ -39,6 +39,9 @@ &--vert padding: 16px + .q-card--dense &--vert + padding: 2px 16px + &--horiz > div, > img