Skip to content

Commit aed7bba

Browse files
pdanpdanrstoenescu
authored andcommitted
Don't pad hideUndelined controlls (quasarframework#2388)
1 parent 9f35e1c commit aed7bba

File tree

6 files changed

+18
-2
lines changed

6 files changed

+18
-2
lines changed

dev/components/form/size-test.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export default {
372372
padding: null,
373373
modes: [
374374
{ hideUnderline: false, inverted: false, box: false, outline: false, fullWidth: false, btnSize: 'form', btnSizeLabel: 'form-label' },
375-
{ hideUnderline: true, inverted: false, box: false, outline: false, fullWidth: false, btnSize: 'form', btnSizeLabel: 'form-label' },
375+
{ hideUnderline: true, inverted: false, box: false, outline: false, fullWidth: false, btnSize: 'form-hide-underline', btnSizeLabel: 'form-label-hide-underline' },
376376
{ hideUnderline: false, inverted: true, box: false, outline: false, fullWidth: false, btnSize: 'form', btnSizeLabel: 'form-label' },
377377
{ hideUnderline: false, inverted: false, box: true, outline: false, fullWidth: false, btnSize: 'form', btnSizeLabel: 'form-label' },
378378
{ hideUnderline: false, inverted: false, box: false, outline: true, fullWidth: false, btnSize: 'form-label', btnSizeLabel: 'form-label' },

src/components/btn/btn-mixin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ const sizes = {
88
lg: 20,
99
xl: 24,
1010
form: 14.777,
11-
'form-label': 21.777
11+
'form-label': 21.777,
12+
'form-hide-underline': 9.333,
13+
'form-label-hide-underline': 16.333
1214
}
1315

1416
export default {

src/components/input-frame/input-frame.ios.styl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ $margin-top-box
5454
padding-bottom $input-padding-bottom
5555
&.q-if-has-label
5656
padding-top $input-padding-top
57+
.q-if-hide-underline
58+
padding-top 0
59+
padding-bottom 0
60+
&.q-if-has-label
61+
padding-top $input-hide-underline-padding-top
5762

5863
.q-if-standard, .q-if-inverted
5964
.q-if-label

src/components/input-frame/input-frame.mat.styl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ $margin-top-box
5656
padding-bottom $input-padding-bottom
5757
&.q-if-has-label
5858
padding-top $input-padding-top
59+
.q-if-hide-underline
60+
padding-top 0
61+
padding-bottom 0
62+
&.q-if-has-label
63+
padding-top $input-hide-underline-padding-top
5964

6065
.q-if-standard, .q-if-inverted
6166
.q-if-label

src/css/variables.ios.styl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ $input-control-size ?= 24px
146146
$input-control-margin ?= 4px
147147
$input-min-height ?= $input-control-size
148148

149+
$input-hide-underline-padding-top ?= 18px
150+
149151
$input-box-padding-top ?= $input-padding-top
150152
$input-box-padding-bottom ?= $input-padding-bottom
151153

src/css/variables.mat.styl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ $input-control-size ?= 24px
147147
$input-control-margin ?= 4px
148148
$input-min-height ?= $input-control-size
149149

150+
$input-hide-underline-padding-top ?= 18px
151+
150152
$input-box-padding-top ?= $input-padding-top
151153
$input-box-padding-bottom ?= $input-padding-bottom
152154

0 commit comments

Comments
 (0)