Skip to content

Commit e8214fb

Browse files
committed
Merge branch 'bootstrap-6' of https://github.com/pardeyke/bootstrap-rubygem-1 into bootstrap-6
2 parents dca7599 + 6efc192 commit e8214fb

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

assets/stylesheets/bootstrap/_drawer.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ $drawer-backdrop-tokens: defaults(
8181
max-height: calc(100% - var(--drawer-inset) * 2);
8282
padding: 0;
8383
margin: 0;
84+
overflow: hidden;
8485
color: var(--drawer-color);
8586
visibility: hidden;
8687
background-color: var(--drawer-bg);
@@ -288,6 +289,7 @@ $drawer-backdrop-tokens: defaults(
288289
flex-direction: column;
289290
gap: var(--drawer-padding-y);
290291
@include dialog-body(var(--drawer-padding-y) var(--drawer-padding-x));
292+
min-height: 0; // allow the body to shrink for inner scrolling
291293
overflow-y: auto;
292294
}
293295

lib/bootstrap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
module Bootstrap
44
VERSION = '6.0.0.alpha1'
5-
BOOTSTRAP_SHA = 'c18d34c38231b1c5bc05e4ae0c53af2227b88019'
5+
BOOTSTRAP_SHA = '45d5f60277230e21bf33bad455f549a22f3aa79e'
66
end

0 commit comments

Comments
 (0)