Skip to content

Commit fb7fb5b

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #892 from twbs/main
Create a new pull request by comparing changes across two branches
2 parents bee32d5 + cacbdc6 commit fb7fb5b

File tree

3 files changed

+58
-1
lines changed

3 files changed

+58
-1
lines changed

‎js/tests/visual/floating-label.html‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,34 @@
167167
<input type="email" readonly class="form-control-plaintext" id="floatingPlaintextInput1" placeholder="[email protected]" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mattis mi at lobortis rutrum. Phasellus varius a risus non lobortis. Ut id congue enim. Quisque facilisis elit ac elit dapibus aliquet nec sit amet arcu. Morbi vitae ultricies eros. Proin varius augue in tristique pretium. Morbi at ullamcorper elit, at ullamcorper massa. Vivamus suscipit quam quis viverra eleifend.">
168168
<label for="floatingPlaintextInput1">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mattis mi at lobortis rutrum. Phasellus varius a risus non lobortis. Ut id congue enim. Quisque facilisis elit ac elit dapibus aliquet nec sit amet arcu. Morbi vitae ultricies eros. Proin varius augue in tristique pretium. Morbi at ullamcorper elit, at ullamcorper massa. Vivamus suscipit quam quis viverra eleifend.</label>
169169
</div>
170+
<!--Compare form-select rendering depending on the size-->
171+
<div class="form-floating">
172+
<select class="form-select" id="floatingSelectRegular" aria-label="Floating label select example">
173+
<option selected="">Open this select menu</option>
174+
<option value="1">One</option>
175+
<option value="2">Two</option>
176+
<option value="3">Three</option>
177+
</select>
178+
<label for="floatingSelectRegular">Works with selects</label>
179+
</div>
180+
<div class="form-floating">
181+
<select class="form-select form-select-sm" id="floatingSelectSmall" aria-label="Floating label select example">
182+
<option selected="">Open this select menu</option>
183+
<option value="1">One</option>
184+
<option value="2">Two</option>
185+
<option value="3">Three</option>
186+
</select>
187+
<label for="floatingSelectSmall">Works with selects</label>
188+
</div>
189+
<div class="form-floating">
190+
<select class="form-select form-select-lg" id="floatingSelectLarge" aria-label="Floating label select example">
191+
<option selected="">Open this select menu</option>
192+
<option value="1">One</option>
193+
<option value="2">Two</option>
194+
<option value="3">Three</option>
195+
</select>
196+
<label for="floatingSelectLarge">Works with selects</label>
197+
</div>
170198
</div>
171199

172200
<div class="container-fluid bg-body" data-bs-theme="dark">
@@ -329,6 +357,34 @@
329357
<input type="email" readonly class="form-control-plaintext" id="floatingPlaintextInput3" placeholder="[email protected]" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mattis mi at lobortis rutrum. Phasellus varius a risus non lobortis. Ut id congue enim. Quisque facilisis elit ac elit dapibus aliquet nec sit amet arcu. Morbi vitae ultricies eros. Proin varius augue in tristique pretium. Morbi at ullamcorper elit, at ullamcorper massa. Vivamus suscipit quam quis viverra eleifend.">
330358
<label for="floatingPlaintextInput3">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mattis mi at lobortis rutrum. Phasellus varius a risus non lobortis. Ut id congue enim. Quisque facilisis elit ac elit dapibus aliquet nec sit amet arcu. Morbi vitae ultricies eros. Proin varius augue in tristique pretium. Morbi at ullamcorper elit, at ullamcorper massa. Vivamus suscipit quam quis viverra eleifend.</label>
331359
</div>
360+
<!--Compare form-select rendering depending on the size-->
361+
<div class="form-floating">
362+
<select class="form-select" id="floatingSelectRegularDark" aria-label="Floating label select example">
363+
<option selected="">Open this select menu</option>
364+
<option value="1">One</option>
365+
<option value="2">Two</option>
366+
<option value="3">Three</option>
367+
</select>
368+
<label for="floatingSelectRegularDark">Works with selects</label>
369+
</div>
370+
<div class="form-floating">
371+
<select class="form-select form-select-sm" id="floatingSelectSmallDark" aria-label="Floating label select example">
372+
<option selected="">Open this select menu</option>
373+
<option value="1">One</option>
374+
<option value="2">Two</option>
375+
<option value="3">Three</option>
376+
</select>
377+
<label for="floatingSelectSmallDark">Works with selects</label>
378+
</div>
379+
<div class="form-floating">
380+
<select class="form-select form-select-lg" id="floatingSelectLargeDark" aria-label="Floating label select example">
381+
<option selected="">Open this select menu</option>
382+
<option value="1">One</option>
383+
<option value="2">Two</option>
384+
<option value="3">Three</option>
385+
</select>
386+
<label for="floatingSelectLargeDark">Works with selects</label>
387+
</div>
332388
</div>
333389
</div>
334390

‎scss/forms/_floating-labels.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
> .form-select {
5252
padding-top: $form-floating-input-padding-t;
5353
padding-bottom: $form-floating-input-padding-b;
54+
padding-left: $form-floating-padding-x;
5455
}
5556

5657
> .form-control:focus,

‎site/content/docs/5.3/migration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Want more information? [Read the v5.1.0 blog post.](https://blog.getbootstrap.co
445445

446446
- Columns no longer have `position: relative` applied, so you may have to add `.position-relative` to some elements to restore that behavior.
447447

448-
- <span class="badge text-bg-danger">Breaking</span> Dropped several `.order-*` classes that often went unused. We now only provide `.order-1` to `.order-5` out of the box.
448+
- <span class="badge text-bg-danger">Breaking</span> Dropped several `.order-*` classes that often went unused. We now only provide `.order-0` to `.order-5` out of the box.
449449

450450
- <span class="badge text-bg-danger">Breaking</span> Dropped the `.media` component as it can be easily replicated with utilities. [See #28265](https://github.com/twbs/bootstrap/pull/28265) and the [flex utilities page for an example]({{< docsref "/utilities/flex#media-object" >}}).
451451

0 commit comments

Comments
 (0)