Skip to content

Commit 7d1171f

Browse files
committed
Fix sizing
1 parent 93c1291 commit 7d1171f

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

scss/_components.button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ $btn-height-computed: $btn-font-size-md * $btn-line-height-md + 2 * nth($btn-pad
162162
}
163163

164164
.btn.btn--lg {
165-
$btn-height-computed: $btn-font-size-lg * $btn-line-height-sm + 2 * nth($btn-padding-lg, 1) + 2 * $btn-border-width;
165+
$btn-height-computed: $btn-font-size-lg * $btn-line-height-lg + 2 * nth($btn-padding-lg, 1) + 2 * $btn-border-width;
166166

167167
font-size: $btn-font-size-lg;
168168
line-height: $btn-line-height-lg;

scss/_components.form.scss

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ $form-control-padding-md: $spacing-squish-sm !default;
2222
$form-control-font-size-md: $text-size-md !default;
2323
$form-control-line-height-md: round-line-height($form-control-font-size-md, $form-control-line-height) !default;
2424

25+
$form-control-padding-lg: $spacing-squish-md !default;
26+
$form-control-font-size-lg: $text-size-lg !default;
27+
$form-control-line-height-lg: round-line-height($form-control-font-size-lg, $form-control-line-height) !default;
28+
2529
$form-control-placeholder-color: rgba($grey-mute, 0.75) !default;
2630
$form-control-disabled-color: $grey-mute !default;
2731
$form-control-disabled-bg: $grey-shade !default;
@@ -213,6 +217,29 @@ $form-control-height-computed: $form-control-font-size-md * $form-contr
213217
min-height: $form-control-height-computed;
214218
}
215219
}
220+
221+
&--lg {
222+
$form-control-height-computed: $form-control-font-size-lg * $form-control-line-height-lg + nth($form-control-padding-lg, 1) * 2 + $form-control-border-width * 2;
223+
224+
font-size: $form-control-font-size-lg;
225+
line-height: $form-control-line-height-lg;
226+
height: $form-control-height-computed;
227+
padding: $form-control-padding-lg;
228+
229+
&.form-input[type="file"] {
230+
min-height: $form-control-height-computed;
231+
}
232+
233+
&.form-select[multiple] {
234+
height: auto;
235+
min-height: $form-control-height-computed;
236+
}
237+
238+
&.form-textarea {
239+
height: auto;
240+
min-height: $form-control-height-computed;
241+
}
242+
}
216243
}
217244

218245
// checkbox

0 commit comments

Comments
 (0)