aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2021-10-09 18:28:28 +0300
committerXhmikosR <[email protected]>2021-10-09 18:28:28 +0300
commitc44d64ed71bd74d322c6023f1cd5a167de126d4f (patch)
tree8b9bf4e26e802ef4eccefbd8c9a5bb13b0cdd5a6 /scss
parentec62be2724e975b6aee2eb97e5f9bb11143c0a34 (diff)
parent1a6fdfae6be09b09eaced8f0e442ca6f7680a61e (diff)
downloadbootstrap-c44d64ed71bd74d322c6023f1cd5a167de126d4f.tar.xz
bootstrap-c44d64ed71bd74d322c6023f1cd5a167de126d4f.zip
Merge remote-tracking branch 'remotes/origin/v513'
Diffstat (limited to 'scss')
-rw-r--r--scss/_buttons.scss1
-rw-r--r--scss/bootstrap-grid.scss2
-rw-r--r--scss/bootstrap-reboot.scss2
-rw-r--r--scss/bootstrap-utilities.scss2
-rw-r--r--scss/bootstrap.scss2
5 files changed, 4 insertions, 5 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index fc72cde4d..ee4287c92 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 b5f43309d..d4a37a063 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 ae6fb7ba1..965332a60 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 95a42199b..d4f981d45 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 e17b27475..0819eee3c 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)