From b9f44d0c8b060d44815eabe8d6d64a9cf901a9ff Mon Sep 17 00:00:00 2001 From: Alice Young Date: Sat, 31 Dec 2016 07:25:52 -0500 Subject: minor rephrasing on layout/overview docs --- docs/layout/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index ee21b70f2..f0decede3 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -118,7 +118,7 @@ Once again, these media queries are also available via Sass mixins: @include media-breakpoint-down(lg) { ... } {% endhighlight %} -We also have media between the breakpoint's minimum and maximum widths for only the given screen size: +We can also use media queries to target a single segment of screen sizes, using the minimum and maximum breakpoint widths: {% highlight scss %} // Extra small devices (portrait phones, less than 576px) @@ -147,7 +147,7 @@ These media queries are also available via Sass mixins: @include media-breakpoint-only(xl) { ... } {% endhighlight %} -And finally media that spans multiple breakpoint widths: +Similarly, media queries may span multiple breakpoint widths: {% highlight scss %} // Example @@ -155,7 +155,7 @@ And finally media that spans multiple breakpoint widths: @media (min-width: 768px) and (max-width: 1199px) { ... } {% endhighlight %} -The Sass mixin for the above example look like that shown beneath: +The Sass mixin for targeting the same screen size range would be: {% highlight scss %} @include media-breakpoint-between(md, lg) { ... } -- cgit v1.2.3 From bccb8ce21300f8da0bfefe1fdde9ab9d87994769 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Dec 2016 11:48:55 -0800 Subject: tweak a few more things - adjust some verbiage - change the example to correct some labels and range names --- docs/layout/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index f0decede3..0bf0b33a1 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -118,7 +118,7 @@ Once again, these media queries are also available via Sass mixins: @include media-breakpoint-down(lg) { ... } {% endhighlight %} -We can also use media queries to target a single segment of screen sizes, using the minimum and maximum breakpoint widths: +There are also media queries and mixins for targeting a single segment of screen sizes using the minimum and maximum breakpoint widths. {% highlight scss %} // Extra small devices (portrait phones, less than 576px) @@ -151,14 +151,14 @@ Similarly, media queries may span multiple breakpoint widths: {% highlight scss %} // Example -// Medium devices (tablets, 768px and up) and Large devices (desktops, 992px and up) +// Apply styles starting from medium devices and up to extra large devices @media (min-width: 768px) and (max-width: 1199px) { ... } {% endhighlight %} The Sass mixin for targeting the same screen size range would be: {% highlight scss %} -@include media-breakpoint-between(md, lg) { ... } +@include media-breakpoint-between(md, xl) { ... } {% endhighlight %} ## Z-index -- cgit v1.2.3 From 20b05e42e33bea09e0632d607e70bcf9552b8d65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Jan 2017 11:48:51 -0800 Subject: update rest of docs, remove navbar specific modifiers, fix docs example css --- docs/layout/overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 0bf0b33a1..736b9ed12 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -171,8 +171,8 @@ We don't encourage customization of these values; should you change one, you lik $zindex-dropdown-backdrop: 990 !default; $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; -$zindex-navbar-fixed: 1030 !default; -$zindex-navbar-sticky: 1030 !default; +$zindex-fixed: 1030 !default; +$zindex-sticky: 1030 !default; $zindex-modal-backdrop: 1040 !default; $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; -- cgit v1.2.3 From a3bc607c1080df2d0bbca03c613aa9e992acb722 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Mon, 16 Jan 2017 00:35:18 -0500 Subject: Remove unused scss variables (#21579) * Remove unused scss variables * Remove unnecessary space * Remove $zindex-navbar from docs * Re-add $progress-box-shadow --- docs/layout/overview.md | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 736b9ed12..04aa2c9ad 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -169,7 +169,6 @@ We don't encourage customization of these values; should you change one, you lik ```scss $zindex-dropdown-backdrop: 990 !default; -$zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; $zindex-fixed: 1030 !default; $zindex-sticky: 1030 !default; -- cgit v1.2.3