Skip to content

Commit 2295bca

Browse files
XhmikosRXhmikosR
authored
Merge branch 'v4-dev' into v4-dev-johann-dropdown-container
2 parents 50de16a + bee20c0 commit 2295bca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+411
-301
lines changed

‎CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4-alpha.getbootstrap.com
1+
getbootstrap.com

‎_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
{% include header.html %}
55
</head>
6-
<body class="bd-docs" data-spy="scroll" data-target=".bd-sidenav-active">
6+
<body>
77
<a id="skippy" class="sr-only sr-only-focusable" href="#content">
88
<div class="container">
99
<span class="skiplink-text">Skip to main content</span>

‎_layouts/docs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
{% include header.html %}
55
</head>
6-
<body class="bd-docs" data-spy="scroll" data-target=".bd-sidenav-active">
6+
<body>
77
<a id="skippy" class="sr-only sr-only-focusable" href="#content">
88
<div class="container">
99
<span class="skiplink-text">Skip to main content</span>

‎_layouts/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
{% include header.html %}
55
</head>
6-
<body class="bd-home">
6+
<body>
77
<a id="skippy" class="sr-only sr-only-focusable" href="#content">
88
<div class="container">
99
<span class="skiplink-text">Skip to main content</span>

‎assets/css/docs.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/docs.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/scss/_colors.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
@each $color, $value in $colors {
66
.swatch-#{$color} {
7+
color: color-yiq($value);
78
background-color: #{$value};
8-
@include color-yiq($value);
99
}
1010
}
1111

1212
@each $color, $value in $theme-colors {
1313
.swatch-#{$color} {
14+
color: color-yiq($value);
1415
background-color: #{$value};
15-
@include color-yiq($value);
1616
}
1717
}
1818

1919
@each $color, $value in $grays {
2020
.swatch-#{$color} {
21+
color: color-yiq($value);
2122
background-color: #{$value};
22-
@include color-yiq($value);
2323
}
2424
}

‎assets/scss/_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
$bd-purple: #563d7c;
33
$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
44
$bd-purple-light: #cdbfe3;
5-
$bd-purple-lightest: #f5f2f9;
65
$bd-graphite: #2a2730;
7-
$bd-graphite-light: lighten($bd-graphite, 40%);
86
$bd-yellow: #ffe484;
97
$bd-danger: #d9534f;
108
$bd-warning: #f0ad4e;

‎dist/css/bootstrap-grid.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-grid.min.css

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-grid.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-reboot.css

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-reboot.min.css

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-reboot.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css

Lines changed: 28 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/4.0/components/alerts.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Alerts can also contain additional HTML elements like headings, paragraphs and d
5050
Using the alert JavaScript plugin, it's possible to dismiss any alert inline. Here's how:
5151

5252
- Be sure you've loaded the alert plugin, or the compiled Bootstrap JavaScript.
53-
- If you're building our JS from source, it [requires `util.js`]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/#util). The compiled version includes this.
53+
- If you're building our JavaScript from source, it [requires `util.js`]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/#util). The compiled version includes this.
5454
- Add a dismiss button and the `.alert-dismissible` class, which adds extra padding to the right of the alert and positions the `.close` button.
5555
- On the dismiss button, add the `data-dismiss="alert"` attribute, which triggers the JavaScript functionality. Be sure to use the `<button>` element with it for proper behavior across all devices.
5656
- To animate alerts when dismissing them, be sure to add the `.fade` and `.show` classes.
@@ -92,6 +92,7 @@ Note that closing an alert will remove it from the DOM.
9292
| --- | --- |
9393
| `$().alert()` | Makes an alert listen for click events on descendant elements which have the `data-dismiss="alert"` attribute. (Not necessary when using the data-api's auto-initialization.) |
9494
| `$().alert('close')` | Closes an alert by removing it from the DOM. If the `.fade` and `.show` classes are present on the element, the alert will fade out before it is removed. |
95+
| `$().alert('dispose')` | Destroys an element's alert. |
9596

9697
{% highlight js %}$(".alert").alert('close'){% endhighlight %}
9798

‎docs/4.0/components/badge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Use the `.badge-pill` modifier class to make badges more rounded (with a larger
7070

7171
## Links
7272

73-
Using the `.badge` classes with the `<a>` element quickly provide _actionable_ badges with hover and focus states.
73+
Using the contextual `.badge-*` classes on an `<a>` element quickly provide _actionable_ badges with hover and focus states.
7474

7575
{% example html %}
7676
{% for color in site.data.theme-colors %}

‎docs/4.0/components/buttons.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,5 @@ Note that pre-checked buttons require you to manually add the `.active` class to
154154

155155
| Method | Description |
156156
| --- | --- |
157-
| `$().button('toggle')` |Toggles push state. Gives the button the appearance that it has been activated. |
157+
| `$().button('toggle')` | Toggles push state. Gives the button the appearance that it has been activated. |
158+
| `$().button('dispose')` | Destroys an element's button. |

‎docs/4.0/components/card.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,19 @@ Create lists of content in a card with a flush list group.
9090
</div>
9191
{% endexample %}
9292

93+
{% example html %}
94+
<div class="card" style="width: 20rem;">
95+
<div class="card-header">
96+
Featured
97+
</div>
98+
<ul class="list-group list-group-flush">
99+
<li class="list-group-item">Cras justo odio</li>
100+
<li class="list-group-item">Dapibus ac facilisis in</li>
101+
<li class="list-group-item">Vestibulum at eros</li>
102+
</ul>
103+
</div>
104+
{% endexample %}
105+
93106
### Kitchen sink
94107

95108
Mix and match multiple content types to create the card you need, or throw everything in there. Shown below are image styles, blocks, text styles, and a list group—all wrapped in a fixed-width card.

‎docs/4.0/components/carousel.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ Cycles to the previous item. **Returns to the caller before the previous item ha
263263

264264
Cycles to the next item. **Returns to the caller before the next item has been shown** (i.e. before the `slid.bs.carousel` event occurs).
265265

266+
### `.carousel('dispose')`
267+
268+
Destroys an element's carousel.
269+
266270
### Events
267271

268272
Bootstrap's carousel class exposes two events for hooking into carousel functionality. Both events have the following additional properties:

‎docs/4.0/components/collapse.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ Shows a collapsible element. **Returns to the caller before the collapsible elem
226226

227227
Hides a collapsible element. **Returns to the caller before the collapsible element has actually been hidden** (i.e. before the `hidden.bs.collapse` event occurs).
228228

229+
### `.collapse('dispose')`
230+
231+
Destroys an element's collapse.
232+
229233
### Events
230234

231235
Bootstrap's collapse class exposes a few events for hooking into collapse functionality.

0 commit comments

Comments
 (0)