Skip to content

Commit

Permalink
Merge branch 'v4-dev' into table-border-color
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR authored Dec 24, 2017
2 parents 535dc01 + 2416801 commit 9d38821
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion docs/4.0/components/forms.md
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ Custom `<select>` menus need only a custom class, `.custom-select` to trigger th
You may also choose from small and large custom selects to match our similarly sized text inputs.

{% example html %}
<select class="custom-select custom-select-lg">
<select class="custom-select custom-select-lg mb-3">
<option selected>Open this select menu</option>
<option value="1">One</option>
<option value="2">Two</option>
Expand Down
1 change: 1 addition & 0 deletions docs/4.0/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ Dropped entirely for the new card component.
- Added new [responsive margin and padding utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/) for all sides, plus vertical and horizontal shorthands.
- Added boatload of [flexbox utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flex/).
- Dropped `.center-block` for the new `.mx-auto` class.
- Clearfix updated to drop support for older browser versions.

### Vendor prefix mixins

Expand Down
5 changes: 2 additions & 3 deletions scss/_custom-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@

.custom-select {
display: inline-block;
max-width: 100%;
width: 100%;
height: $input-height;
padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
line-height: $custom-select-line-height;
Expand Down Expand Up @@ -219,13 +219,12 @@
.custom-file {
position: relative;
display: inline-block;
max-width: 100%;
width: 100%;
height: $custom-file-height;
margin-bottom: 0;
}

.custom-file-input {
min-width: $custom-file-width;
max-width: 100%;
height: $custom-file-height;
margin: 0;
Expand Down
10 changes: 0 additions & 10 deletions scss/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
.custom-file {
display: flex;
align-items: center;
width: 100%;

.custom-file-input {
width: 100%;
min-width: 0;
}

&:not(:first-child):not(:last-of-type) .custom-file-control,
&:not(:first-child):not(:last-of-type) .custom-file-control::before { @include border-radius(0); }
Expand All @@ -57,10 +51,6 @@
&:last-of-type:not(:first-child) .custom-file-control,
&:last-of-type:not(:first-child) .custom-file-control::before { @include border-left-radius(0); }
}

.custom-select {
width: 100%;
}
}


Expand Down
1 change: 0 additions & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,6 @@ $custom-select-font-size-lg: 125% !default;
$custom-select-height-lg: $input-height-lg !default;

$custom-file-height: $input-height !default;
$custom-file-width: 14rem !default;
$custom-file-focus-border-color: $input-focus-border-color !default;
$custom-file-focus-box-shadow: $input-btn-focus-box-shadow !default;

Expand Down

0 comments on commit 9d38821

Please sign in to comment.