Skip to content

Commit e4a95c5

Browse files
committed
fix(QUploader): dark prop
1 parent 88722ca commit e4a95c5

File tree

5 files changed

+53
-4
lines changed

5 files changed

+53
-4
lines changed

dev/components/components/uploader.vue

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22
<div>
33
<div class="layout-padding">
44
<q-input v-model="url" />
5+
<br>
6+
<div class="bg-black q-pa-sm" style="max-width: 500px">
7+
<q-uploader dark :url="url" multiple color="lime" float-label="Float label" />
8+
<br>
9+
<q-uploader dark hide-underline :url="url" multiple color="orange" float-label="Float label" />
10+
<br>
11+
<q-field
12+
icon="wifi"
13+
label="Wifi network"
14+
:count="10"
15+
helper="We need this for connecting you"
16+
>
17+
<q-uploader dark :url="url" multiple color="orange" float-label="Float label" />
18+
</q-field>
19+
<br>
20+
<q-field
21+
icon="wifi"
22+
label="Wifi network"
23+
:count="10"
24+
helper="We need this for connecting you"
25+
>
26+
<q-uploader dark inverted :url="url" multiple color="orange" float-label="Float label" />
27+
</q-field>
28+
</div>
29+
530
<p class="caption">Single File Upload</p>
631
<q-uploader style="max-width: 320px" color="amber" stack-label="Stack Label" :url="url" />
732

dev/components/form/color-picker.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<p>Lazy</p>
1212
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" stack-label="simple" />
1313
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" clearable stack-label="clearable" />
14-
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-value="#ccc" stack-label="default-selection" />
15-
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-value="#ccc" clearable stack-label="default-selection, clearable" />
14+
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-selection="#ccc" stack-label="default-selection" />
15+
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-selection="#ccc" clearable stack-label="default-selection, clearable" />
1616

1717
<br><br>
1818
<q-btn color="primary" label="Set to yellow" @click="setToYellow"/>

src/components/uploader/QUploader.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<div
33
class="q-uploader relative-position"
4+
:class="classes"
45
@dragover.prevent.stop="__onDragOver"
56
>
67
<q-input-frame
@@ -238,6 +239,13 @@ export default {
238239
cls.push('inverted')
239240
}
240241
return cls
242+
},
243+
classes () {
244+
return {
245+
'q-uploader-expanded': this.expanded,
246+
'q-uploader-dark': this.dark,
247+
'q-uploader-files-no-border': this.inverted || !this.hideUnderline
248+
}
241249
}
242250
},
243251
watch: {

src/components/uploader/uploader.ios.styl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
.q-uploader-files
1515
border 1px solid $grey-4
16-
border-top 0
1716
font-size 14px
1817
max-height 500px
18+
.q-uploader-files-no-border .q-uploader-files
19+
border-top 0 !important
1920
.q-uploader-file:not(:last-child)
2021
border-bottom 1px solid $grey-4
2122
.q-uploader-progress-bg, .q-uploader-progress-text
@@ -35,3 +36,10 @@
3536
background rgba(255, 255, 255, .6)
3637
&.inverted
3738
background rgba(0, 0, 0, .3)
39+
40+
.q-uploader-dark
41+
.q-uploader-files
42+
color white
43+
border 1px solid $field-dark-label-color
44+
.q-uploader-file:not(:last-child)
45+
border-bottom 1px solid $field-dark-label-color

src/components/uploader/uploader.mat.styl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
.q-uploader-files
1515
border 1px solid $grey-4
16-
border-top 0
1716
font-size 14px
1817
max-height 500px
18+
.q-uploader-files-no-border .q-uploader-files
19+
border-top 0 !important
1920
.q-uploader-file:not(:last-child)
2021
border-bottom 1px solid $grey-4
2122
.q-uploader-progress-bg, .q-uploader-progress-text
@@ -35,3 +36,10 @@
3536
background rgba(255, 255, 255, .6)
3637
&.inverted
3738
background rgba(0, 0, 0, .3)
39+
40+
.q-uploader-dark
41+
.q-uploader-files
42+
color white
43+
border 1px solid $field-dark-label-color
44+
.q-uploader-file:not(:last-child)
45+
border-bottom 1px solid $field-dark-label-color

0 commit comments

Comments
 (0)