Skip to content

Commit

Permalink
materia: remove mixed units on form-control min-heights #1298
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaspark
thomaspark committed Mar 9, 2024
1 parent 4a98b02 commit 279b456
Show file tree
Hide file tree
Showing 14 changed files with 52 additions and 40 deletions.
6 changes: 6 additions & 0 deletions dist/materia/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ $font-family-sans-serif: Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI
$font-size-base: 1rem !default;
$font-weight-base: 400 !default;

$line-height-base: 1.5 !default;

// Buttons

$input-btn-padding-y: .8rem !default;
Expand All @@ -78,6 +80,10 @@ $input-border-radius-sm: 0 !default;
$input-placeholder-color: rgba(0, 0, 0, .4) !default;
$input-group-addon-bg: transparent !default;

$input-height: calc($line-height-base * 1em + $input-padding-y * 2) !default;
$input-height-sm: $line-height-base * 1em !default;
$input-height-lg: calc($line-height-base * 1em + $input-padding-y-lg * 2) !default;

// Navs

$nav-link-disabled-color: $gray-500 !default;
Expand Down
16 changes: 8 additions & 8 deletions dist/materia/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2245,7 +2245,7 @@ progress {
}

.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
padding: 0 0;
font-size: 0.875rem;
border-radius: 0;
Expand All @@ -2264,7 +2264,7 @@ progress {
}

.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
padding: 1.25rem 0;
font-size: 1.25rem;
border-radius: 0;
Expand All @@ -2283,18 +2283,18 @@ progress {
}

textarea.form-control {
min-height: calc(1.5em + 2rem + calc(0 * 2));
min-height: calc(1.5em + 2rem);
}
textarea.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
}
textarea.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
}

.form-control-color {
width: 3rem;
height: calc(1.5em + 2rem + calc(0 * 2));
height: calc(1.5em + 2rem);
padding: 1rem;
}
.form-control-color:not(:disabled):not([readonly]) {
Expand All @@ -2309,10 +2309,10 @@ textarea.form-control-lg {
border-radius: 0;
}
.form-control-color.form-control-sm {
height: calc(1.5em + 0 + calc(0 * 2));
height: 1.5em;
}
.form-control-color.form-control-lg {
height: calc(1.5em + 2.5rem + calc(0 * 2));
height: calc(1.5em + 2.5rem);
}

.form-select {
Expand Down
2 changes: 1 addition & 1 deletion dist/materia/bootstrap.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/materia/bootstrap.min.css.map
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions dist/materia/bootstrap.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@ progress {
}

.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
padding: 0 0;
font-size: 0.875rem;
border-radius: 0;
Expand All @@ -2262,7 +2262,7 @@ progress {
}

.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
padding: 1.25rem 0;
font-size: 1.25rem;
border-radius: 0;
Expand All @@ -2281,18 +2281,18 @@ progress {
}

textarea.form-control {
min-height: calc(1.5em + 2rem + calc(0 * 2));
min-height: calc(1.5em + 2rem);
}
textarea.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
}
textarea.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
}

.form-control-color {
width: 3rem;
height: calc(1.5em + 2rem + calc(0 * 2));
height: calc(1.5em + 2rem);
padding: 1rem;
}
.form-control-color:not(:disabled):not([readonly]) {
Expand All @@ -2307,10 +2307,10 @@ textarea.form-control-lg {
border-radius: 0;
}
.form-control-color.form-control-sm {
height: calc(1.5em + 0 + calc(0 * 2));
height: 1.5em;
}
.form-control-color.form-control-lg {
height: calc(1.5em + 2.5rem + calc(0 * 2));
height: calc(1.5em + 2.5rem);
}

.form-select {
Expand Down
2 changes: 1 addition & 1 deletion dist/materia/bootstrap.rtl.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/materia/bootstrap.rtl.min.css.map
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions docs/5/materia/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ $font-family-sans-serif: Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI
$font-size-base: 1rem !default;
$font-weight-base: 400 !default;

$line-height-base: 1.5 !default;

// Buttons

$input-btn-padding-y: .8rem !default;
Expand All @@ -78,6 +80,10 @@ $input-border-radius-sm: 0 !default;
$input-placeholder-color: rgba(0, 0, 0, .4) !default;
$input-group-addon-bg: transparent !default;

$input-height: calc($line-height-base * 1em + $input-padding-y * 2) !default;
$input-height-sm: $line-height-base * 1em !default;
$input-height-lg: calc($line-height-base * 1em + $input-padding-y-lg * 2) !default;

// Navs

$nav-link-disabled-color: $gray-500 !default;
Expand Down
16 changes: 8 additions & 8 deletions docs/5/materia/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2245,7 +2245,7 @@ progress {
}

.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
padding: 0 0;
font-size: 0.875rem;
border-radius: 0;
Expand All @@ -2264,7 +2264,7 @@ progress {
}

.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
padding: 1.25rem 0;
font-size: 1.25rem;
border-radius: 0;
Expand All @@ -2283,18 +2283,18 @@ progress {
}

textarea.form-control {
min-height: calc(1.5em + 2rem + calc(0 * 2));
min-height: calc(1.5em + 2rem);
}
textarea.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
}
textarea.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
}

.form-control-color {
width: 3rem;
height: calc(1.5em + 2rem + calc(0 * 2));
height: calc(1.5em + 2rem);
padding: 1rem;
}
.form-control-color:not(:disabled):not([readonly]) {
Expand All @@ -2309,10 +2309,10 @@ textarea.form-control-lg {
border-radius: 0;
}
.form-control-color.form-control-sm {
height: calc(1.5em + 0 + calc(0 * 2));
height: 1.5em;
}
.form-control-color.form-control-lg {
height: calc(1.5em + 2.5rem + calc(0 * 2));
height: calc(1.5em + 2.5rem);
}

.form-select {
Expand Down
2 changes: 1 addition & 1 deletion docs/5/materia/bootstrap.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/5/materia/bootstrap.min.css.map
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/5/materia/bootstrap.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@ progress {
}

.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
padding: 0 0;
font-size: 0.875rem;
border-radius: 0;
Expand All @@ -2262,7 +2262,7 @@ progress {
}

.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
padding: 1.25rem 0;
font-size: 1.25rem;
border-radius: 0;
Expand All @@ -2281,18 +2281,18 @@ progress {
}

textarea.form-control {
min-height: calc(1.5em + 2rem + calc(0 * 2));
min-height: calc(1.5em + 2rem);
}
textarea.form-control-sm {
min-height: calc(1.5em + 0 + calc(0 * 2));
min-height: 1.5em;
}
textarea.form-control-lg {
min-height: calc(1.5em + 2.5rem + calc(0 * 2));
min-height: calc(1.5em + 2.5rem);
}

.form-control-color {
width: 3rem;
height: calc(1.5em + 2rem + calc(0 * 2));
height: calc(1.5em + 2rem);
padding: 1rem;
}
.form-control-color:not(:disabled):not([readonly]) {
Expand All @@ -2307,10 +2307,10 @@ textarea.form-control-lg {
border-radius: 0;
}
.form-control-color.form-control-sm {
height: calc(1.5em + 0 + calc(0 * 2));
height: 1.5em;
}
.form-control-color.form-control-lg {
height: calc(1.5em + 2.5rem + calc(0 * 2));
height: calc(1.5em + 2.5rem);
}

.form-select {
Expand Down
2 changes: 1 addition & 1 deletion docs/5/materia/bootstrap.rtl.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/5/materia/bootstrap.rtl.min.css.map
View file

Large diffs are not rendered by default.

0 comments on commit 279b456

Please sign in to comment.