diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2021-10-09 18:28:28 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2021-10-09 18:28:28 +0300 |
| commit | c44d64ed71bd74d322c6023f1cd5a167de126d4f (patch) | |
| tree | 8b9bf4e26e802ef4eccefbd8c9a5bb13b0cdd5a6 /scss | |
| parent | ec62be2724e975b6aee2eb97e5f9bb11143c0a34 (diff) | |
| parent | 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e (diff) | |
Merge remote-tracking branch 'remotes/origin/v513'
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_buttons.scss | 1 | ||||
| -rw-r--r-- | scss/bootstrap-grid.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap-reboot.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap-utilities.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index fc72cde4d3..ee4287c920 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -4,7 +4,6 @@ .btn { display: inline-block; - align-self: center; font-family: $btn-font-family; font-weight: $btn-font-weight; line-height: $btn-line-height; diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index b5f43309d9..d4a37a063e 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v5.1.2 (https://getbootstrap.com/) + * Bootstrap Grid v5.1.3 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index ae6fb7ba10..965332a606 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v5.1.2 (https://getbootstrap.com/) + * Bootstrap Reboot v5.1.3 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss index 95a42199b1..d4f981d450 100644 --- a/scss/bootstrap-utilities.scss +++ b/scss/bootstrap-utilities.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Utilities v5.1.2 (https://getbootstrap.com/) + * Bootstrap Utilities v5.1.3 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index e17b274753..0819eee3c7 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v5.1.2 (https://getbootstrap.com/) + * Bootstrap v5.1.3 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) |