mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch 'v4-dev' into v4-navbars
This commit is contained in:
commit
271f10f74f
24
dist/css/bootstrap-flex.css
vendored
24
dist/css/bootstrap-flex.css
vendored
@ -6033,6 +6033,30 @@ button.close {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.align-baseline {
|
||||||
|
vertical-align: baseline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-top {
|
||||||
|
vertical-align: top !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-middle {
|
||||||
|
vertical-align: middle !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-bottom {
|
||||||
|
vertical-align: bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-bottom {
|
||||||
|
vertical-align: text-bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-top {
|
||||||
|
vertical-align: text-top !important;
|
||||||
|
}
|
||||||
|
|
||||||
.bg-faded {
|
.bg-faded {
|
||||||
background-color: #f7f7f9;
|
background-color: #f7f7f9;
|
||||||
}
|
}
|
||||||
|
2
dist/css/bootstrap-flex.css.map
vendored
2
dist/css/bootstrap-flex.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap-flex.min.css
vendored
2
dist/css/bootstrap-flex.min.css
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap-flex.min.css.map
vendored
2
dist/css/bootstrap-flex.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -5805,6 +5805,30 @@ button.close {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.align-baseline {
|
||||||
|
vertical-align: baseline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-top {
|
||||||
|
vertical-align: top !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-middle {
|
||||||
|
vertical-align: middle !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-bottom {
|
||||||
|
vertical-align: bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-bottom {
|
||||||
|
vertical-align: text-bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-top {
|
||||||
|
vertical-align: text-top !important;
|
||||||
|
}
|
||||||
|
|
||||||
.bg-faded {
|
.bg-faded {
|
||||||
background-color: #f7f7f9;
|
background-color: #f7f7f9;
|
||||||
}
|
}
|
||||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css.map
vendored
2
dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -66,6 +66,7 @@
|
|||||||
- title: Sizing and positioning
|
- title: Sizing and positioning
|
||||||
- title: Spacing
|
- title: Spacing
|
||||||
- title: Typography
|
- title: Typography
|
||||||
|
- title: Vertical align
|
||||||
|
|
||||||
# - title: Extend
|
# - title: Extend
|
||||||
# pages:
|
# pages:
|
||||||
|
24
docs/dist/css/bootstrap-flex.css
vendored
24
docs/dist/css/bootstrap-flex.css
vendored
@ -6033,6 +6033,30 @@ button.close {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.align-baseline {
|
||||||
|
vertical-align: baseline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-top {
|
||||||
|
vertical-align: top !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-middle {
|
||||||
|
vertical-align: middle !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-bottom {
|
||||||
|
vertical-align: bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-bottom {
|
||||||
|
vertical-align: text-bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-top {
|
||||||
|
vertical-align: text-top !important;
|
||||||
|
}
|
||||||
|
|
||||||
.bg-faded {
|
.bg-faded {
|
||||||
background-color: #f7f7f9;
|
background-color: #f7f7f9;
|
||||||
}
|
}
|
||||||
|
2
docs/dist/css/bootstrap-flex.css.map
vendored
2
docs/dist/css/bootstrap-flex.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap-flex.min.css
vendored
2
docs/dist/css/bootstrap-flex.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap-flex.min.css.map
vendored
2
docs/dist/css/bootstrap-flex.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -5805,6 +5805,30 @@ button.close {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.align-baseline {
|
||||||
|
vertical-align: baseline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-top {
|
||||||
|
vertical-align: top !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-middle {
|
||||||
|
vertical-align: middle !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-bottom {
|
||||||
|
vertical-align: bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-bottom {
|
||||||
|
vertical-align: text-bottom !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-text-top {
|
||||||
|
vertical-align: text-top !important;
|
||||||
|
}
|
||||||
|
|
||||||
.bg-faded {
|
.bg-faded {
|
||||||
background-color: #f7f7f9;
|
background-color: #f7f7f9;
|
||||||
}
|
}
|
||||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css.map
vendored
2
docs/dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
37
docs/utilities/vertical-align.md
Normal file
37
docs/utilities/vertical-align.md
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
---
|
||||||
|
layout: docs
|
||||||
|
title: Vertical alignment
|
||||||
|
group: utilities
|
||||||
|
---
|
||||||
|
|
||||||
|
Change the alignment of elements with the [`vertical-alignment`](https://developer.mozilla.org/en-US/docs/Web/CSS/vertical-align) utilities. Please note that vertical-align only affects inline, inline-block, inline-table, and table cell elements.
|
||||||
|
|
||||||
|
Choose from `.align-baseline`, `.align-top`, `.align-middle`, `.align-bottom`, `.align-text-bottom`, and `.align-text-top` as needed.
|
||||||
|
|
||||||
|
With inline elements:
|
||||||
|
|
||||||
|
{% example html %}
|
||||||
|
<span class="align-baseline">baseline</span>
|
||||||
|
<span class="align-top">top</span>
|
||||||
|
<span class="align-middle">middle</span>
|
||||||
|
<span class="align-bottom">bottom</span>
|
||||||
|
<span class="align-text-top">text-top</span>
|
||||||
|
<span class="align-text-bottom">text-bottom</span>
|
||||||
|
{% endexample %}
|
||||||
|
|
||||||
|
With table cells:
|
||||||
|
|
||||||
|
{% example html %}
|
||||||
|
<table style="height: 100px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="align-baseline">baseline</td>
|
||||||
|
<td class="align-top">top</td>
|
||||||
|
<td class="align-middle">middle</td>
|
||||||
|
<td class="align-bottom">bottom</td>
|
||||||
|
<td class="align-text-top">text-top</td>
|
||||||
|
<td class="align-text-bottom">text-bottom</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endexample %}
|
@ -1,3 +1,4 @@
|
|||||||
|
@import "utilities/align";
|
||||||
@import "utilities/background";
|
@import "utilities/background";
|
||||||
@import "utilities/borders";
|
@import "utilities/borders";
|
||||||
@import "utilities/clearfix";
|
@import "utilities/clearfix";
|
||||||
|
6
scss/utilities/_align.scss
Normal file
6
scss/utilities/_align.scss
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
.align-baseline { vertical-align: baseline !important; } // Browser default
|
||||||
|
.align-top { vertical-align: top !important; }
|
||||||
|
.align-middle { vertical-align: middle !important; }
|
||||||
|
.align-bottom { vertical-align: bottom !important; }
|
||||||
|
.align-text-bottom { vertical-align: text-bottom !important; }
|
||||||
|
.align-text-top { vertical-align: text-top !important; }
|
Loading…
Reference in New Issue
Block a user