From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 13 Aug 2017 23:44:52 +0000 (-0700)
Subject: Rearrange margins for .highlight (#23396)
X-Git-Tag: v4.0.0-beta.2~382^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52310bfd69719cec463e2a7282d0d696c7a62b40;p=thirdparty%2Fbootstrap.git

Rearrange margins for .highlight (#23396)

Only applies the margins to .highlight instances within .bd-content, thus negating any need for #23279.
---

diff --git a/assets/scss/_component-examples.scss b/assets/scss/_component-examples.scss
index 629adcbec8..5779825cf0 100644
--- a/assets/scss/_component-examples.scss
+++ b/assets/scss/_component-examples.scss
@@ -392,16 +392,26 @@
 
 .highlight {
   padding: 1rem;
-  margin: 1rem (-$grid-gutter-width / 2);
+  margin-top: 1rem;
+  margin-bottom: 1rem;
   background-color: #f7f7f9;
   -ms-overflow-style: -ms-autohiding-scrollbar;
 
   @include media-breakpoint-up(sm) {
     padding: 1.5rem;
+  }
+}
+
+.bd-content .highlight {
+  margin-right: (-$grid-gutter-width / 2);
+  margin-left: (-$grid-gutter-width / 2);
+
+  @include media-breakpoint-up(sm) {
     margin-right: 0;
     margin-left: 0;
   }
 }
+
 .highlight pre {
   padding: 0;
   margin-top: 0;