diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
| commit | 4c2f5443596c39c551ebb7ec635d01a98e434189 (patch) | |
| tree | 3bb7d0a5bcd80e2758578c8d597c7554d7fd4b0c /scss | |
| parent | eb84c03ddf5993d701724250507055b4e394fbdb (diff) | |
| parent | 65ffb1c3b6e94440812a2e228cb8e8be512652ec (diff) | |
| download | bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.tar.xz bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_navbar.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss index e90b0e0c6..80beec8f3 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -76,7 +76,7 @@ // Custom styles for responsive collapsing and toggling of navbar contents. // Powered by the collapse Bootstrap JavaScript plugin. -// Button for toggling the navbar when in it's collapsed state +// Button for toggling the navbar when in its collapsed state .navbar-toggler { align-self: flex-start; // Prevent toggler from growing to full width when it's the only visible navbar child padding: $navbar-toggler-padding-y $navbar-toggler-padding-x; diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 8cce876de..88a60cafa 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) + * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) |