Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/scss/_brand.scss2
-rw-r--r--assets/scss/_component-examples.scss2
-rw-r--r--assets/scss/_content.scss2
-rw-r--r--build/.stylelintrc2
-rw-r--r--scss/_card.scss27
-rw-r--r--scss/_tables.scss1
6 files changed, 18 insertions, 18 deletions
diff --git a/assets/scss/_brand.scss b/assets/scss/_brand.scss
index 1fb2119a25..2d5c5a4cf4 100644
--- a/assets/scss/_brand.scss
+++ b/assets/scss/_brand.scss
@@ -1,3 +1,5 @@
+// stylelint-disable no-duplicate-selectors
+
//
// Brand guidelines
//
diff --git a/assets/scss/_component-examples.scss b/assets/scss/_component-examples.scss
index 2a2c740b35..3d216991af 100644
--- a/assets/scss/_component-examples.scss
+++ b/assets/scss/_component-examples.scss
@@ -1,4 +1,4 @@
-// stylelint-disable selector-no-qualifying-type
+// stylelint-disable no-duplicate-selectors, selector-no-qualifying-type
//
// Grid examples
diff --git a/assets/scss/_content.scss b/assets/scss/_content.scss
index b8311495cf..112370a2da 100644
--- a/assets/scss/_content.scss
+++ b/assets/scss/_content.scss
@@ -1,4 +1,4 @@
-// stylelint-disable selector-max-combinators, selector-max-compound-selectors, selector-max-type, selector-no-qualifying-type
+// stylelint-disable no-duplicate-selectors, selector-max-combinators, selector-max-compound-selectors, selector-max-type, selector-no-qualifying-type
//
// Automatically style Markdown-based tables like a Bootstrap `.table`.
diff --git a/build/.stylelintrc b/build/.stylelintrc
index 8fa3104909..0027d7a082 100644
--- a/build/.stylelintrc
+++ b/build/.stylelintrc
@@ -32,7 +32,7 @@
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "never",
"no-descending-specificity": null,
- "no-duplicate-selectors": null,
+ "no-duplicate-selectors": true,
"number-leading-zero": "never",
"order/properties-order": [
"position",
diff --git a/scss/_card.scss b/scss/_card.scss
index ad4221806b..25c511a90b 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -17,6 +17,18 @@
margin-right: 0;
margin-left: 0;
}
+
+ > .list-group:first-child {
+ .list-group-item:first-child {
+ @include border-top-radius($card-border-radius);
+ }
+ }
+
+ > .list-group:last-child {
+ .list-group-item:last-child {
+ @include border-bottom-radius($card-border-radius);
+ }
+ }
}
.card-body {
@@ -49,21 +61,6 @@
}
}
-.card {
- > .list-group:first-child {
- .list-group-item:first-child {
- @include border-top-radius($card-border-radius);
- }
- }
-
- > .list-group:last-child {
- .list-group-item:last-child {
- @include border-bottom-radius($card-border-radius);
- }
- }
-}
-
-
//
// Optional textual caps
//
diff --git a/scss/_tables.scss b/scss/_tables.scss
index 32384391e1..6bd0b91a43 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -103,6 +103,7 @@
//
// Same table markup, but inverted color scheme: dark background and light text.
+// stylelint-disable-next-line no-duplicate-selectors
.table {
.thead-dark {
th {