From 3689be81157dd86838d2d291b9c8c086eaa04f5d Mon Sep 17 00:00:00 2001
From: Heiko Jansen
Date: Wed, 24 May 2017 16:32:36 +0200
Subject: Sync code shown with code actually used
Remove class and attributes from buttons which are not expected to trigger dropdowns.
Code used to render the examples is correct but code shown was not.
---
docs/components/dropdowns.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'docs')
diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md
index 13f49a32f..24cabbf9a 100644
--- a/docs/components/dropdowns.md
+++ b/docs/components/dropdowns.md
@@ -323,7 +323,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
-
-
+
Small button
--
cgit v1.2.3
From da3185ee0a3957627d918956c9c2266cfa2d3029 Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 21:35:43 -0700
Subject: new homepage, new assets, clean out old stuff
---
docs/4.0/examples/index.md | 1 +
docs/4.0/extend/icons.md | 1 +
docs/4.0/utilities/borders.md | 1 +
docs/4.0/utilities/colors.md | 1 +
4 files changed, 4 insertions(+)
(limited to 'docs')
diff --git a/docs/4.0/examples/index.md b/docs/4.0/examples/index.md
index dd52fe9bd..bec2f014c 100644
--- a/docs/4.0/examples/index.md
+++ b/docs/4.0/examples/index.md
@@ -1,6 +1,7 @@
---
layout: simple
title: Examples
+description: Quickly get a project started with any of our examples ranging from using parts of the framework to custom components and layouts.
redirect_from:
- /examples/
---
diff --git a/docs/4.0/extend/icons.md b/docs/4.0/extend/icons.md
index 3b4aea3eb..f7da1ca83 100644
--- a/docs/4.0/extend/icons.md
+++ b/docs/4.0/extend/icons.md
@@ -17,6 +17,7 @@ We've tested and used these icon sets ourselves.
## More options
While we haven't tried these out, they do look promising and provide multiple formats—including SVG.
+- [Bytesize](https://github.com/danklammer/bytesize-icons)
- [Google Material icons](https://material.io/icons/)
- [Ionicons](http://ionicons.com/)
- [Feather](http://colebemis.com/feather/)
diff --git a/docs/4.0/utilities/borders.md b/docs/4.0/utilities/borders.md
index db8bcee19..fcc064d39 100644
--- a/docs/4.0/utilities/borders.md
+++ b/docs/4.0/utilities/borders.md
@@ -30,6 +30,7 @@ Change the border color using utilities built on our theme colors.
{% example html %}
{% for color in site.data.theme-colors %}
{% endfor %}
+
{% endexample %}
diff --git a/docs/4.0/utilities/colors.md b/docs/4.0/utilities/colors.md
index 11ac0be60..ed4ba1066 100644
--- a/docs/4.0/utilities/colors.md
+++ b/docs/4.0/utilities/colors.md
@@ -23,6 +23,7 @@ Similar to the contextual text color classes, easily set the background of an el
{% example html %}
{% for color in site.data.theme-colors %}
.bg-{{ color.name }}
{% endfor %}
+
.bg-white
{% endexample %}
{% callout info %}
--
cgit v1.2.3
From fd113b93f6977685c81ebc615aed9573079afe5c Mon Sep 17 00:00:00 2001
From: XhmikosR
Date: Wed, 9 Aug 2017 18:09:28 +0300
Subject: Fix flex order generated code and a typo.
---
docs/4.0/utilities/flex.md | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
(limited to 'docs')
diff --git a/docs/4.0/utilities/flex.md b/docs/4.0/utilities/flex.md
index 4bc5996fb..1d28fab6d 100644
--- a/docs/4.0/utilities/flex.md
+++ b/docs/4.0/utilities/flex.md
@@ -357,17 +357,14 @@ Change the _visual_ order of specific flex items with a handful of `order` utili
Responsive variations also exist for `order`.
-{% for bp in site.data.breakpoints %}
- {% for i in (1..12) %}
- - `.order{{ bp.abbr }}-{{ i }}`
- {% endfor %}
-{% endfor %}
+{% for bp in site.data.breakpoints %}{% for i in (1..12) %}
+- `.order{{ bp.abbr }}-{{ i }}`{% endfor %}{% endfor %}
## Align content
Use `align-content` utilities on flexbox containers to align flex items *together* on the cross axis. Choose from `start` (browser default), `end`, `center`, `between`, `around`, or `stretch`. To demonstrate these utilities, we've enforced `flex-wrap: wrap` and increased the number of flex items.
-**Heads up!** This property has no affect on single rows of flex items.
+**Heads up!** This property has no effect on single rows of flex items.
--
cgit v1.2.3
From ba7d9217323e8f0ecf6d8548779cc399ac0f5c51 Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 21:42:36 -0700
Subject: clarify optional js, add some links, emphasize some text
---
docs/4.0/getting-started/introduction.md | 5 +++--
docs/4.0/getting-started/javascript.md | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
(limited to 'docs')
diff --git a/docs/4.0/getting-started/introduction.md b/docs/4.0/getting-started/introduction.md
index 233c82883..b135326e7 100644
--- a/docs/4.0/getting-started/introduction.md
+++ b/docs/4.0/getting-started/introduction.md
@@ -24,7 +24,7 @@ Copy-paste the stylesheet `` into your `` before all other styleshee
{% endhighlight %}
-Add our JavaScript plugins, jQuery, and Popper.js near the end of your pages, right before the closing `` tag. Be sure to place jQuery and Popper.js first, as our code depends on them. While we use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/) in our docs, the full version is also supported.
+Add our optional JavaScript plugins, jQuery, and [Popper.js](https://github.com/FezVrasta/popper.js)) near the end of your pages, right before the closing `
Hello, world!
-
+
+
diff --git a/docs/4.0/getting-started/javascript.md b/docs/4.0/getting-started/javascript.md
index c4fb2366a..003ebdb7b 100644
--- a/docs/4.0/getting-started/javascript.md
+++ b/docs/4.0/getting-started/javascript.md
@@ -1,7 +1,7 @@
---
layout: docs
title: JavaScript
-description: Bring Bootstrap to life with our JavaScript plugins built on jQuery. Learn about each plugin, our data and programmatic API options, and more.
+description: Bring Bootstrap to life with our optional JavaScript plugins built on jQuery. Learn about each plugin, our data and programmatic API options, and more.
group: getting-started
toc: true
---
@@ -12,7 +12,9 @@ Plugins can be included individually (using Bootstrap's individual `*.js` files)
## Dependencies
-Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included **before** the plugin files). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported.
+Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that **all plugins depend on jQuery** (this means jQuery must be included **before** the plugin files). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported.
+
+Our tooltips and popovers also depend on [Popper.js](https://github.com/FezVrasta/popper.js).
## Data attributes
--
cgit v1.2.3
From 4e07146624f0c1dac765c984a2ecca90fcc3113e Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 21:57:08 -0700
Subject: rewrite parts of download page
---
docs/4.0/getting-started/download.md | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
(limited to 'docs')
diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md
index 468575494..3837d296a 100644
--- a/docs/4.0/getting-started/download.md
+++ b/docs/4.0/getting-started/download.md
@@ -6,28 +6,44 @@ group: getting-started
toc: true
---
-## Bootstrap CSS and JS
+## Compiled CSS and JS
-**Download Bootstrap's ready-to-use code to easily drop into your project.** Includes compiled and minified versions of all our CSS bundles (default, grid only, or Reboot only) and JavaScript plugins. Doesn't include documentation or source files.
+Download ready-to-use compiled code for **Bootstrap v{{ site.current_version}}** to easily drop into your project, which includes:
-**Current version:** v{{ site.current_version}}
+- Compiled and minified CSS bundles (default, grid-only, and Reboot-only)
+- Compiled and minified JavaScript plugins
-Download Bootstrap
+This doesn't include documentation, source files, or any optional JavaScript dependencies (jQuery and Popper.js).
+
+Download
## Source files
-**Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup).
+
+Compile Bootstrap with your own asset pipeline by downloading our source Sass, JavaScript, and documentation files. This option requires some additional tooling:
+
+- Sass compiler (Libsass or Ruby Sass is supported) for compiling your CSS.
+- [Autoprefixer](https://github.com/postcss/autoprefixer) for CSS vendor prefixing
+
+Should you require [build tools]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup), they are included for developing Bootstrap and it's docs, but they're likely unsuitable for your own purposes.
Download source
## Bootstrap CDN
-Skip the download and use the Bootstrap CDN to deliver Bootstrap's compiled CSS and JS to your project.
+Skip the download with the Bootstrap CDN to deliver cached version of Bootstrap's compiled CSS and JS to your project.
{% highlight html %}
{% endhighlight %}
+If you're using our compiled JavaScript, don't forget to include CDN versions of jQuery and Popper.js before it.
+
+{% highlight html %}
+
+
+{% endhighlight %}
+
## Package managers
Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler and [Autoprefixer](https://github.com/postcss/autoprefixer)** for a setup that matches our official compiled versions.
--
cgit v1.2.3
From 209a9635391a4137cd2792f4227ab1c95742a5a2 Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 21:57:28 -0700
Subject: remove commented out code while here
---
docs/4.0/getting-started/introduction.md | 4 ----
1 file changed, 4 deletions(-)
(limited to 'docs')
diff --git a/docs/4.0/getting-started/introduction.md b/docs/4.0/getting-started/introduction.md
index b135326e7..6423209be 100644
--- a/docs/4.0/getting-started/introduction.md
+++ b/docs/4.0/getting-started/introduction.md
@@ -10,10 +10,6 @@ redirect_from:
toc: true
---
-
-
-
-
## Quick start
Looking to quickly add Bootstrap to your project? Use the Bootstrap CDN, provided for free by the folks at MaxCDN. Using a package manager or need to download the source files? [Head to the downloads page.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/download/)
--
cgit v1.2.3
From 94e860c5579ceb3847c44b157ef4f7720942a389 Mon Sep 17 00:00:00 2001
From: Jonathan
Date: Thu, 10 Aug 2017 15:15:27 +0200
Subject: Dropped .radio-inline and .checkbox-inline
Dropped `.radio-inline` and `.checkbox-inline`.
---
docs/4.0/migration.md | 1 +
1 file changed, 1 insertion(+)
(limited to 'docs')
diff --git a/docs/4.0/migration.md b/docs/4.0/migration.md
index 101f7f9de..323d321f6 100644
--- a/docs/4.0/migration.md
+++ b/docs/4.0/migration.md
@@ -99,6 +99,7 @@ New to Bootstrap 4 is the [Reboot]({{ site.baseurl }}/docs/{{ site.docs_version
- Renamed `.input-lg` and `.input-sm` to `.form-control-lg` and `.form-control-sm`, respectively.
- Dropped `.form-group-*` classes for simplicity's sake. Use `.form-control-*` classes instead now.
- Dropped `.help-block` and replaced it with `.form-text` for block-level help text. For inline help text and other flexible options, use utility classes like `.text-muted`.
+- Dropped `.radio-inline` and `.checkbox-inline`.
- Horizontal forms overhauled:
- Dropped the `.form-horizontal` class requirement.
- `.form-group` no longer applies styles from the `.row` via mixin, so `.row` is now required for horizontal grid layouts (e.g., `
`).
--
cgit v1.2.3
From 3fbdedbf22dc9257e06d73b13f6db7244dbda7cb Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 22:36:57 -0700
Subject: Add basic property-value utils for position
---
docs/4.0/utilities/position.md | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'docs')
diff --git a/docs/4.0/utilities/position.md b/docs/4.0/utilities/position.md
index fb7d8bd9e..9cf952452 100644
--- a/docs/4.0/utilities/position.md
+++ b/docs/4.0/utilities/position.md
@@ -6,6 +6,18 @@ group: utilities
toc: true
---
+## Common values
+
+Quick positioning classes are available, though they are not responsive.
+
+{% highlight html %}
+
...
+
...
+
...
+
...
+
...
+{% endhighlight %}
+
## Fixed top
Position an element at the top of the viewport, from edge to edge. Be sure you understand the ramifications of fixed position in your project; you may need to add aditional CSS.
--
cgit v1.2.3
From 006590ed9a7e39c4fac96cf732d5241edd95a59c Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Mon, 7 Aug 2017 22:25:35 -0700
Subject: Remove broken CSS that tried to reset the absolute positioning when
there was no text
---
docs/4.0/components/forms.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'docs')
diff --git a/docs/4.0/components/forms.md b/docs/4.0/components/forms.md
index 6abe03e58..eb3deb415 100644
--- a/docs/4.0/components/forms.md
+++ b/docs/4.0/components/forms.md
@@ -238,17 +238,17 @@ Group checkboxes or radios on the same horizontal row by adding `.form-check-inl
### Without labels
-Should you have no text within the `