From d459dfac74e90c29950d49a82edc19fd913d435e Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 29 Jul 2021 08:25:05 +0000 Subject: update to bootstrap 5.0.2 --- .../site/assets/scss/_component-examples.scss | 6 +- .../twbs/bootstrap/site/assets/scss/_content.scss | 6 +- .../twbs/bootstrap/site/assets/scss/_layout.scss | 51 ++++++++++++++ .../twbs/bootstrap/site/assets/scss/_navbar.scss | 32 +++++++++ .../twbs/bootstrap/site/assets/scss/_subnav.scss | 79 ++++++++++++++++++++++ 5 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 vendor/twbs/bootstrap/site/assets/scss/_layout.scss create mode 100644 vendor/twbs/bootstrap/site/assets/scss/_navbar.scss create mode 100644 vendor/twbs/bootstrap/site/assets/scss/_subnav.scss (limited to 'vendor/twbs/bootstrap/site/assets/scss') diff --git a/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss b/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss index 005515922..e831b1609 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_component-examples.scss @@ -70,7 +70,7 @@ .bd-example { position: relative; padding: 1rem; - margin: 1rem (-$grid-gutter-width / 2) 0; + margin: 1rem (-$grid-gutter-width * .5) 0; border: solid $gray-300; border-width: 1px 0 0; @include clearfix(); @@ -312,8 +312,8 @@ } .bd-content .highlight { - margin-right: (-$grid-gutter-width / 2); - margin-left: (-$grid-gutter-width / 2); + margin-right: (-$grid-gutter-width * .5); + margin-left: (-$grid-gutter-width * .5); @include media-breakpoint-up(sm) { margin-right: 0; diff --git a/vendor/twbs/bootstrap/site/assets/scss/_content.scss b/vendor/twbs/bootstrap/site/assets/scss/_content.scss index cc22ffe11..f2b5cfc54 100644 --- a/vendor/twbs/bootstrap/site/assets/scss/_content.scss +++ b/vendor/twbs/bootstrap/site/assets/scss/_content.scss @@ -22,12 +22,12 @@ > ol li { margin-bottom: .25rem; - // stylelint-disable selector-max-type - > ul { + // stylelint-disable selector-max-type, selector-max-compound-selectors + > p ~ ul { margin-top: -.5rem; margin-bottom: 1rem; } - // stylelint-enable selector-max-type + // stylelint-enable selector-max-type, selector-max-compound-selectors } // Override Bootstrap defaults diff --git a/vendor/twbs/bootstrap/site/assets/scss/_layout.scss b/vendor/twbs/bootstrap/site/assets/scss/_layout.scss new file mode 100644 index 000000000..707c4949d --- /dev/null +++ b/vendor/twbs/bootstrap/site/assets/scss/_layout.scss @@ -0,0 +1,51 @@ +.bd-layout { + @include media-breakpoint-up(md) { + display: grid; + gap: $grid-gutter-width; + grid-template-areas: "sidebar main"; + grid-template-columns: 1fr 3fr; + } + + @include media-breakpoint-up(lg) { + grid-template-columns: 1fr 5fr; + } +} + +.bd-sidebar { + grid-area: sidebar; +} + +.bd-main { + grid-area: main; + + @include media-breakpoint-up(md) { + display: grid; + gap: inherit; + grid-template-areas: + "intro" + "toc" + "content"; + grid-template-rows: auto auto 1fr; + } + + @include media-breakpoint-up(lg) { + grid-template-areas: + "intro toc" + "content toc"; + grid-template-columns: 4fr 1fr; + grid-template-rows: auto 1fr; + } +} + +.bd-intro { + grid-area: intro; +} + +.bd-toc { + grid-area: toc; +} + +.bd-content { + grid-area: content; + min-width: 1px; // Fix width when bd-content contains a `
` https://github.com/twbs/bootstrap/issues/25410
+}
diff --git a/vendor/twbs/bootstrap/site/assets/scss/_navbar.scss b/vendor/twbs/bootstrap/site/assets/scss/_navbar.scss
new file mode 100644
index 000000000..053cadf2e
--- /dev/null
+++ b/vendor/twbs/bootstrap/site/assets/scss/_navbar.scss
@@ -0,0 +1,32 @@
+.bd-navbar {
+  padding: .75rem 0;
+  background-color: $bd-purple-bright;
+
+  .navbar-toggler {
+    padding: 0;
+    border: 0;
+  }
+
+  .navbar-nav {
+    .nav-link {
+      padding-right: $spacer * .25;
+      padding-left: $spacer * .25;
+      color: rgba($white, .85);
+
+      &:hover,
+      &:focus {
+        color: $white;
+      }
+
+      &.active {
+        font-weight: 600;
+        color: $white;
+      }
+    }
+  }
+
+  .navbar-nav-svg {
+    width: 1rem;
+    height: 1rem;
+  }
+}
diff --git a/vendor/twbs/bootstrap/site/assets/scss/_subnav.scss b/vendor/twbs/bootstrap/site/assets/scss/_subnav.scss
new file mode 100644
index 000000000..8377ff423
--- /dev/null
+++ b/vendor/twbs/bootstrap/site/assets/scss/_subnav.scss
@@ -0,0 +1,79 @@
+.bd-subnavbar {
+  // The position and z-index are needed for the dropdown to stay on top of the content
+  position: relative;
+  z-index: $zindex-sticky;
+  background-color: rgba($white, .95);
+  box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .05), inset 0 -1px 0 rgba(0, 0, 0, .15);
+
+  .dropdown-menu {
+    @include font-size(.875rem);
+    box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .05);
+  }
+
+  .dropdown-item.current {
+    font-weight: 600;
+    background-image: escape-svg($dropdown-active-icon);
+    background-repeat: no-repeat;
+    background-position: right $dropdown-item-padding-x top .6rem;
+    background-size: .75rem .75rem;
+  }
+
+  @include media-breakpoint-up(md) {
+    position: sticky;
+    top: 0;
+  }
+}
+
+.bd-search {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    top: .4rem;
+    right: .4rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 1.5rem;
+    padding-right: .25rem;
+    padding-left: .25rem;
+    @include font-size(.75rem);
+    color: $gray-600;
+    content: "Ctrl + /";
+    border: $border-width solid $border-color;
+    @include border-radius(.125rem);
+  }
+
+  @include media-breakpoint-down(md) {
+    width: 100%;
+  }
+
+  .form-control {
+    padding-right: 3.75rem;
+
+    &:focus {
+      border-color: $bd-purple-bright;
+      box-shadow: 0 0 0 3px rgba($bd-purple-bright, .25);
+    }
+  }
+}
+
+.bd-sidebar-toggle {
+  color: $text-muted;
+
+  &:hover,
+  &:focus {
+    color: $bd-purple-bright;
+  }
+
+  &:focus {
+    box-shadow: 0 0 0 3px rgba($bd-purple-bright, .25);
+  }
+
+  .bi-collapse { display: none; }
+
+  &:not(.collapsed) {
+    .bi-expand { display: none; }
+    .bi-collapse { display: inline-block; }
+  }
+}
-- 
cgit v1.2.3