Merge branch 'v4-dev' into v4-split-buttons

2 files changed, 45 insertions, 2 deletions

diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index 3a76a651b..cc2585d5d 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -159,7 +159,7 @@ $container-max-widths: (
   md: 720px,
   lg: 940px,
   xl: 1140px
-) !default;
+);
 {% endhighlight %}
 
 ### Mixins
@@ -470,7 +470,7 @@ $container-max-widths: (
   sm: 420px,
   md: 720px,
   lg: 940px
-) !default;
+);
 {% endhighlight %}
 
 Save your changes and recompile to have a brand new set of predefined grid classes for column widths, offsets, pushes, and pulls. Responsive visibility utilities will also be updated to use the custom breakpoints.
diff --git a/docs/layout/overview.md b/docs/layout/overview.md
index c8652cb7a..44a12aee6 100644
--- a/docs/layout/overview.md
+++ b/docs/layout/overview.md
@@ -111,3 +111,46 @@ Once again, these media queries are also available via Sass mixins:
 @include media-breakpoint-down(md) { ... }
 @include media-breakpoint-down(lg) { ... }
 {% endhighlight %}
+
+We also have media between the breakpoint's minimum and maximum widths for only the given screen size:
+
+{% highlight scss %}
+// Extra small devices (portrait phones, less than 544px)
+@media (max-width: 543px) { ... }
+
+// Small devices (landscape phones, 544px and up)
+@media (min-width: 544px) and (max-width: 767px) { ... }
+
+// Medium devices (tablets, 768px and up)
+@media (min-width: 768px) and (max-width: 991px) { ... }
+
+// Large devices (desktops, 992px and up)
+@media (min-width: 992px) and (max-width: 1199px) { ... }
+
+// Extra large devices (large desktops, 1200px and up)
+@media (min-width: 1200px) { ... }
+{% endhighlight %}
+
+These media queries are also available via Sass mixins:
+
+{% highlight scss %}
+@include media-breakpoint-only(xs) { ... }
+@include media-breakpoint-only(sm) { ... }
+@include media-breakpoint-only(md) { ... }
+@include media-breakpoint-only(lg) { ... }
+@include media-breakpoint-only(xl) { ... }
+{% endhighlight %}
+
+And finally media that spans multiple breakpoint widths:
+
+{% highlight scss %}
+// Example 
+// Medium devices (tablets, 768px and up) and  Large devices (desktops, 992px and up)
+@media (min-width: 768px) and (max-width: 1199px) { ... }
+{% endhighlight %}
+
+The Sass mixin for the above example look like that shown beneath:
+
+{% highlight scss %}
+@include media-breakpoint-between(md, lg) { ... }
+{% endhighlight %}