diff options
Diffstat (limited to 'vendor/twbs/bootstrap/site/assets')
5 files changed, 40 insertions, 45 deletions
diff --git a/vendor/twbs/bootstrap/site/assets/js/application.js b/vendor/twbs/bootstrap/site/assets/js/application.js index 6bb71f0c2..712b31a23 100644 --- a/vendor/twbs/bootstrap/site/assets/js/application.js +++ b/vendor/twbs/bootstrap/site/assets/js/application.js @@ -14,9 +14,10 @@ // Scroll the active sidebar link into view const sidenav = document.querySelector('.bd-sidebar') - if (sidenav) { + const sidenavActiveLink = document.querySelector('.bd-links-nav .active') + + if (sidenav && sidenavActiveLink) { const sidenavHeight = sidenav.clientHeight - const sidenavActiveLink = document.querySelector('.bd-links-nav .active') const sidenavActiveLinkTop = sidenavActiveLink.offsetTop const sidenavActiveLinkHeight = sidenavActiveLink.clientHeight const viewportTop = sidenavActiveLinkTop diff --git a/vendor/twbs/bootstrap/site/assets/scss/_colors.scss b/vendor/twbs/bootstrap/site/assets/scss/_colors.scss index a71a8973b..da4bbace1 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_colors.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_colors.scss @@ -41,7 +41,6 @@ } // stylelint-disable declaration-block-single-line-max-declarations - .bd-blue-100 { color: color-contrast($blue-100); background-color: $blue-100; } .bd-blue-200 { color: color-contrast($blue-200); background-color: $blue-200; } .bd-blue-300 { color: color-contrast($blue-300); background-color: $blue-300; } diff --git a/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss b/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss index 14adbe94d..0f1018b06 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss @@ -2,12 +2,16 @@ // Docs examples // -.bd-example-snippet { +.bd-code-snippet { + margin: 0 ($bd-gutter-x * -.5) 1rem; border: solid var(--bs-border-color); border-width: 1px 0; @include media-breakpoint-up(md) { + margin-right: 0; + margin-left: 0; border-width: 1px; + @include border-radius(var(--bs-border-radius)); } } @@ -16,7 +20,7 @@ position: relative; padding: var(--bd-example-padding); - margin: 0 ($bd-gutter-x * -.5); + margin: 0 ($bd-gutter-x * -.5) 1rem; border: solid var(--bs-border-color); border-width: 1px 0; @include clearfix(); @@ -27,13 +31,7 @@ margin-right: 0; margin-left: 0; border-width: 1px; - @include border-top-radius(var(--bs-border-radius)); - } - - + .bd-code-snippet { - @include border-top-radius(0); - border: solid var(--bs-border-color); - border-width: 0 1px 1px; + @include border-radius(var(--bs-border-radius)); } + p { @@ -350,18 +348,22 @@ .highlight { position: relative; padding: .75rem ($bd-gutter-x * .5); - margin-bottom: 1rem; background-color: var(--bd-pre-bg); @include media-breakpoint-up(md) { padding: .75rem 1.25rem; - @include border-radius(var(--bs-border-radius)); + @include border-radius(calc(var(--bs-border-radius) - 1px)); + } + + @include media-breakpoint-up(lg) { + pre { + margin-right: 1.875rem; + } } pre { padding: .25rem 0 .875rem; margin-top: .8125rem; - margin-right: 1.875rem; margin-bottom: 0; overflow: overlay; white-space: pre; @@ -376,32 +378,22 @@ } } -.bd-code-snippet { - margin: 0 ($bd-gutter-x * -.5) $spacer; +.highlight-toolbar { + background-color: var(--bd-pre-bg); - .highlight { - margin-bottom: 0; + + .highlight { @include border-top-radius(0); } - - .bd-example { - margin: 0; - border: 0; - } - - @include media-breakpoint-up(md) { - margin-right: 0; - margin-left: 0; - @include border-radius($border-radius); - } } -.highlight-toolbar { - background-color: var(--bd-pre-bg); -} - -.bd-scss-docs { +.bd-file-ref { .highlight-toolbar { - @include border-top-radius(calc(var(--bs-border-radius) + 1px)); + @include media-breakpoint-up(md) { + @include border-top-radius(calc(var(--bs-border-radius) - 1px)); + } } } + +.bd-content .bd-code-snippet { + margin-bottom: 1rem; +} diff --git a/vendor/twbs/bootstrap/site/assets/scss/_masthead.scss b/vendor/twbs/bootstrap/site/assets/scss/_masthead.scss index 33015d681..d74d1ec24 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_masthead.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_masthead.scss @@ -22,6 +22,8 @@ .bd-code-snippet { margin: 0; + border-color: var(--bs-border-color-translucent); + border-width: 1px; @include border-radius(.5rem); } @@ -32,7 +34,7 @@ text-overflow: ellipsis; white-space: nowrap; background-color: rgba(var(--bs-body-color-rgb), .075); - @include border-radius(.5rem); + @include border-radius(calc(.5rem - 1px)); @include media-breakpoint-up(lg) { padding-right: 4rem; @@ -40,9 +42,7 @@ pre { padding: 0; - margin-top: .625rem; - margin-right: 1.875rem; - margin-bottom: .625rem; + margin: .625rem 0; overflow: hidden; } } @@ -75,10 +75,6 @@ @include font-size(1rem); } - .highlight { - @include border-radius(.5rem); - } - @include media-breakpoint-up(md) { .lead { @include font-size(1.25rem); diff --git a/vendor/twbs/bootstrap/site/assets/scss/_syntax.scss b/vendor/twbs/bootstrap/site/assets/scss/_syntax.scss index 0cc26d76b..38ac11fb8 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_syntax.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_syntax.scss @@ -35,6 +35,13 @@ --base0D: #{$blue-300}; // #61afef --base0E: #{$indigo-200}; // #c678dd --base0F: #{$red-300}; // #be5046 + + .language-diff .gd { + color: $red-400; + } + .language-diff .gi { + color: $green-400; + } } .hl { background-color: var(--base02); } @@ -53,7 +60,7 @@ .ge { font-style: italic; } .gh { font-weight: 600; - color: #fff; + color: var(--base0A); } .gi { color: var(--bs-success); } .gp { |