Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorMark Otto <markd.otto@gmail.com>2017-08-14 02:44:52 +0300
committerGitHub <noreply@github.com>2017-08-14 02:44:52 +0300
commit52310bfd69719cec463e2a7282d0d696c7a62b40 (patch)
tree7c08e52127aa22118745bf3eb2f673ef14266a46 /assets
parent012224386cab458c47782a13a03df1726258492f (diff)
Rearrange margins for .highlight (#23396)
Only applies the margins to .highlight instances within .bd-content, thus negating any need for #23279.
Diffstat (limited to 'assets')
-rw-r--r--assets/scss/_component-examples.scss12
1 files changed, 11 insertions, 1 deletions
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;