Skip to content

Commit 0c7f62d

Browse files
rstoenescurstoenescu
committed
fix: Various btn fixes
1 parent 9adc1fd commit 0c7f62d

File tree

8 files changed

+52
-33
lines changed

8 files changed

+52
-33
lines changed

‎dev/components/components/button-dropdown.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<q-item-tile label>Photos</q-item-tile>
1111
<q-item-tile sublabel>February 22, 2016</q-item-tile>
1212
</q-item-main>
13-
</q-item-side right icon="info" />
13+
<q-item-side right icon="info" />
1414
</q-item>
1515
<q-item-separator inset />
1616
<q-list-header inset>Files</q-list-header>
@@ -20,7 +20,7 @@
2020
<q-item-tile label>Vacation</q-item-tile>
2121
<q-item-tile sublabel>February 22, 2016</q-item-tile>
2222
</q-item-main>
23-
</q-item-side right icon="info" />
23+
<q-item-side right icon="info" />
2424
</q-item>
2525
</q-list>
2626
</q-btn-dropdown>
@@ -39,7 +39,7 @@
3939
<q-item-tile label>Photos</q-item-tile>
4040
<q-item-tile sublabel>February 22, 2016</q-item-tile>
4141
</q-item-main>
42-
</q-item-side right icon="info" />
42+
<q-item-side right icon="info" />
4343
</q-item>
4444
<q-item-separator inset />
4545
<q-list-header inset>Files</q-list-header>
@@ -49,7 +49,7 @@
4949
<q-item-tile label>Vacation</q-item-tile>
5050
<q-item-tile sublabel>February 22, 2016</q-item-tile>
5151
</q-item-main>
52-
</q-item-side right icon="info" />
52+
<q-item-side right icon="info" />
5353
</q-item>
5454
</q-list>
5555
</q-btn-dropdown>
@@ -62,7 +62,7 @@
6262
<q-item-tile label>Photos</q-item-tile>
6363
<q-item-tile sublabel>February 22, 2016</q-item-tile>
6464
</q-item-main>
65-
</q-item-side right icon="info" />
65+
<q-item-side right icon="info" />
6666
</q-item>
6767
<q-item-separator inset />
6868
<q-list-header inset>Files</q-list-header>
@@ -72,7 +72,7 @@
7272
<q-item-tile label>Vacation</q-item-tile>
7373
<q-item-tile sublabel>February 22, 2016</q-item-tile>
7474
</q-item-main>
75-
</q-item-side right icon="info" />
75+
<q-item-side right icon="info" />
7676
</q-item>
7777
</q-list>
7878
</q-btn-dropdown>
@@ -85,7 +85,7 @@
8585
<q-item-tile label>Photos</q-item-tile>
8686
<q-item-tile sublabel>February 22, 2016</q-item-tile>
8787
</q-item-main>
88-
</q-item-side right icon="info" />
88+
<q-item-side right icon="info" />
8989
</q-item>
9090
<q-item-separator inset />
9191
<q-list-header inset>Files</q-list-header>
@@ -95,7 +95,7 @@
9595
<q-item-tile label>Vacation</q-item-tile>
9696
<q-item-tile sublabel>February 22, 2016</q-item-tile>
9797
</q-item-main>
98-
</q-item-side right icon="info" />
98+
<q-item-side right icon="info" />
9999
</q-item>
100100
</q-list>
101101
</q-btn-dropdown>
@@ -108,7 +108,7 @@
108108
<q-item-tile label>Photos</q-item-tile>
109109
<q-item-tile sublabel>February 22, 2016</q-item-tile>
110110
</q-item-main>
111-
</q-item-side right icon="info" />
111+
<q-item-side right icon="info" />
112112
</q-item>
113113
<q-item-separator inset />
114114
<q-list-header inset>Files</q-list-header>
@@ -118,7 +118,7 @@
118118
<q-item-tile label>Vacation</q-item-tile>
119119
<q-item-tile sublabel>February 22, 2016</q-item-tile>
120120
</q-item-main>
121-
</q-item-side right icon="info" />
121+
<q-item-side right icon="info" />
122122
</q-item>
123123
</q-list>
124124
</q-btn-dropdown>

‎src/components/breadcrumbs/QBreadcrumbs.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
const alignMap = {
2-
left: 'start',
3-
center: 'center',
4-
right: 'end',
5-
justify: 'between'
6-
}
1+
import AlignMixin from '../../mixins/align'
72

83
export default {
94
name: 'q-breadcrumbs',
5+
mixins: [AlignMixin],
106
props: {
117
color: {
128
type: String,
@@ -21,14 +17,12 @@ export default {
2117
default: '/'
2218
},
2319
align: {
24-
type: String,
25-
default: 'left',
26-
validator: v => ['left', 'center', 'right', 'justify'].includes(v)
20+
default: 'left'
2721
}
2822
},
2923
computed: {
3024
classes () {
31-
return [`text-${this.color}`, `justify-${alignMap[this.align]}`]
25+
return [`text-${this.color}`, this.alignClass]
3226
}
3327
},
3428
render (h) {

‎src/components/btn/QBtnDropdown.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ export default {
4242
'q-icon',
4343
{
4444
props: {
45-
name: this.$q.icon.input.dropdown
45+
name: this.$q.icon.input.dropdown,
46+
color: this.textColor
4647
},
4748
staticClass: 'transition-generic',
4849
'class': {

‎src/components/btn/btn-default.mat.styl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@
7575
.q-btn-round
7676
border-radius 50%
7777
padding 0
78-
box-shadow $button-shadow
7978
min-height 0
8079
height 3em
8180
width 3em
82-
box-shadow none
81+
&:not(.q-btn-flat):not(.q-btn-outline)
82+
box-shadow $button-shadow
8383

8484
.q-btn-dense
8585
padding .285em

‎src/components/btn/btn-mixin.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import Ripple from '../../directives/ripple'
22
import { QIcon } from '../icon'
3+
import AlignMixin from '../../mixins/align'
34

45
const sizes = {
56
xs: 8, sm: 10, md: 14, lg: 20, xl: 24
67
}
78

89
export default {
10+
mixins: [AlignMixin],
911
components: {
1012
QIcon
1113
},
@@ -32,11 +34,6 @@ export default {
3234
glossy: Boolean,
3335
dense: Boolean,
3436
noRipple: Boolean,
35-
justify: {
36-
type: String,
37-
default: 'center',
38-
validator: v => ['start', 'end', 'center', 'between', 'around'].includes(v)
39-
},
4037
tabindex: Number
4138
},
4239
computed: {
@@ -112,7 +109,7 @@ export default {
112109
return cls
113110
},
114111
innerClasses () {
115-
const classes = [`justify-${this.justify}`]
112+
const classes = [ this.alignClass ]
116113
if (this.noWrap) {
117114
classes.push('no-wrap', 'text-no-wrap')
118115
}

‎src/css/core/positioning.styl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.pull-left, .float-left
1+
.float-left
22
float left
3-
.pull-right, .float-right
3+
.float-right
44
float right
55

66
.relative-position

‎src/css/core/typography.styl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ for $heading, $value in $h-tags
2525
{$heading}
2626
font-size: $value.size
2727
font-weight: $value.weight
28-
margin: 0 0 $spaces.md.y
2928
if $value.line-height
3029
line-height: $value.line-height
3130
if $value.letter-spacing
@@ -39,7 +38,6 @@ for $heading, $value in $headings
3938
.q-{$heading}
4039
font-size: $value.size
4140
font-weight: $value.weight
42-
margin: 0 0 $spaces.md.y
4341
if $value.line-height
4442
line-height: $value.line-height
4543
if $value.letter-spacing
@@ -48,6 +46,13 @@ for $heading, $value in $headings
4846
p
4947
margin: 0 0 $spaces.md.y
5048

49+
.caption
50+
color $grey-9
51+
letter-spacing 0
52+
line-height 24px
53+
padding 0
54+
font-weight 300
55+
5156
.uppercase
5257
text-transform uppercase
5358
.lowercase

‎src/mixins/align.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
const alignMap = {
2+
left: 'start',
3+
center: 'center',
4+
right: 'end',
5+
between: 'between',
6+
around: 'around'
7+
}
8+
9+
export default {
10+
props: {
11+
align: {
12+
type: String,
13+
default: 'center',
14+
validator: v => ['left', 'right', 'center', 'between', 'around'].includes(v)
15+
}
16+
},
17+
computed: {
18+
alignClass () {
19+
return `justify-${alignMap[this.align]}`
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)