Skip to content

Commit 726bd6c

Browse files
committed
feat: Updates to QSpinner
1 parent 7e7c41c commit 726bd6c

32 files changed

+131
-363
lines changed

dev/components/components/button.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
Button
4545
<span slot="loading">Loading...</span>
4646
</q-btn>
47-
<q-btn loader class="orange" @click="simulateProgress">Button</q-btn>
48-
<q-btn loader class="secondary" @click="simulateProgress">Button</q-btn>
49-
<q-btn loader class="amber" @click="simulateProgress">Button</q-btn>
50-
<q-btn loader class="dark small" @click="simulateProgress">Button</q-btn>
47+
<q-btn loader color="orange" @click="simulateProgress">Button</q-btn>
48+
<q-btn loader color="secondary" @click="simulateProgress">Button</q-btn>
49+
<q-btn loader color="amber" @click="simulateProgress">Button</q-btn>
50+
<q-btn loader color="dark" small @click="simulateProgress">Button</q-btn>
5151
<q-btn small round loader @click="simulateProgress" color="primary"><q-icon name="mail" /></q-btn>
5252
<q-btn round loader @click="simulateProgress" color="primary"><q-icon name="mail" /></q-btn>
5353
<q-btn big round loader @click="simulateProgress" color="primary"><q-icon name="mail" /></q-btn>

dev/components/components/spinner.vue

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
<template>
22
<div>
33
<div class="layout-padding">
4-
<div>
5-
<div class="light-paragraph">
6-
Size: {{ size }}px
7-
</div>
8-
<div>
9-
<q-range label v-model="size" :min="20" :max="256" />
10-
</div>
4+
<q-field
5+
icon="format size"
6+
:label="`Size: ${size}px`"
7+
>
8+
<q-range label v-model="size" :min="20" :max="256" />
9+
</q-field>
1110

12-
<q-icon class="text-grey-7" style="font-size: 2rem" name="palette" />
13-
<label for="color-spinner" class="auto">Color</label>
14-
<q-input id="color-spinner" class="inline" v-model="color" style="width: 80px; text-align: center; margin-right: 10px;" />
15-
<q-dialog-select
16-
type="radio"
17-
v-model="color"
18-
class="inline"
19-
:options="colorOptions"
20-
ok-label="Pick"
21-
title="Spinner Color"
22-
style="vertical-align: middle"
23-
></q-dialog-select>
24-
</div>
11+
<q-field
12+
icon="palette"
13+
label="Color"
14+
>
15+
<div class="row no-wrap">
16+
<q-input
17+
v-model="color"
18+
class="col"
19+
float-label="Color Palette"
20+
/>
21+
<q-select
22+
class="col"
23+
v-model="color"
24+
float-label="Quick Pick"
25+
:options="colorOptions"
26+
/>
27+
</div>
28+
</q-field>
2529

2630
<p class="caption">
2731
Hover over them to see their names
@@ -38,9 +42,9 @@
3842
</div>
3943
</div>
4044

41-
<p class="caption" :style="{color: color}">
45+
<p class="caption">
4246
Default Theme Spinner:
43-
<q-spinner :size="size" style="margin-left: 1rem;"></q-spinner>
47+
<q-spinner :color="color" :size="size" style="margin-left: 1rem;" />
4448
</p>
4549
</div>
4650
</div>
@@ -51,7 +55,7 @@ export default {
5155
data () {
5256
return {
5357
size: 36,
54-
color: '#00ff00',
58+
color: 'primary',
5559
spinners: [
5660
'audio', 'ball', 'bars', 'circles', 'dots',
5761
'facebook', 'gears', 'grid', 'hearts',
@@ -62,22 +66,32 @@ export default {
6266
{
6367
label: 'Black',
6468
color: 'black',
65-
value: '#000000'
69+
value: 'black'
70+
},
71+
{
72+
label: 'Primary',
73+
color: 'primary',
74+
value: 'primary'
75+
},
76+
{
77+
label: 'Secondary',
78+
color: 'secondary',
79+
value: 'secondary'
6680
},
6781
{
6882
label: 'Red',
6983
color: 'red',
70-
value: '#ff0000'
84+
value: 'red'
7185
},
7286
{
7387
label: 'Green',
7488
color: 'green',
75-
value: '#00ff00'
89+
value: 'green'
7690
},
7791
{
7892
label: 'Blue',
7993
color: 'blue',
80-
value: '#0000ff'
94+
value: 'blue'
8195
}
8296
]
8397
}

dev/components/components/stepper.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@
217217

218218
<div class="fixed-top-left">
219219
<q-toggle v-model="loading" style="top: 18px; left: 18px;"/>
220-
<q-tooltip anchor="bottom right" self="center left" :offset="[10, 10]">
220+
<q-tooltip anchor="bottom right" self="center left" :offset="[20, 10]">
221221
Turn on to see the progress spinners.
222222
</q-tooltip>
223223
</div>
224224

225225
<div class="fixed-top-right">
226226
<q-toggle v-model="alternativeLabels" style="top: 18px; right: 18px;"/>
227-
<q-tooltip anchor="bottom left" self="center right" :offset="[10, 10]">
227+
<q-tooltip anchor="bottom left" self="center right" :offset="[20, 10]">
228228
Turn on to see the alternative lables.
229229
</q-tooltip>
230230
</div>

0 commit comments

Comments
 (0)