diff --git a/.stylelintrc.json b/.stylelintrc.json index 589884aae7..045dbeff4e 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -13,7 +13,6 @@ "outline": "none" }, "function-disallowed-list": [ - "calc", "lighten", "darken" ], diff --git a/scss/_accordion.scss b/scss/_accordion.scss index 591ebfe654..4f1a190e1a 100644 --- a/scss/_accordion.scss +++ b/scss/_accordion.scss @@ -55,7 +55,7 @@ &:not(.collapsed) { color: var(--#{$prefix}accordion-active-color); background-color: var(--#{$prefix}accordion-active-bg); - box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list + box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); &::after { background-image: var(--#{$prefix}accordion-btn-active-icon); diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 9162e12e20..3dce7f231c 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -45,7 +45,7 @@ // Prevent double borders when buttons are next to each other > :not(.btn-check:first-child) + .btn, > .btn-group:not(:first-child) { - margin-left: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list + margin-left: calc(-1 * #{$btn-border-width}); } // Reset rounded corners @@ -132,7 +132,7 @@ > .btn:not(:first-child), > .btn-group:not(:first-child) { - margin-top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list + margin-top: calc(-1 * #{$btn-border-width}); } // Reset rounded corners diff --git a/scss/_card.scss b/scss/_card.scss index 530170a885..f4ec930ea0 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -87,7 +87,7 @@ } .card-subtitle { - margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y)); // stylelint-disable-line function-disallowed-list + margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y)); margin-bottom: 0; color: var(--#{$prefix}card-subtitle-color); } @@ -139,9 +139,9 @@ // .card-header-tabs { - margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list - margin-bottom: calc(-1 * var(--#{$prefix}card-cap-padding-y)); // stylelint-disable-line function-disallowed-list - margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list + margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); + margin-bottom: calc(-1 * var(--#{$prefix}card-cap-padding-y)); + margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); border-bottom: 0; .nav-link.active { @@ -151,8 +151,8 @@ } .card-header-pills { - margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list - margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list + margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); + margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); } // Card image diff --git a/scss/_list-group.scss b/scss/_list-group.scss index f7e80b289b..0598528e56 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -118,7 +118,7 @@ border-top-width: 0; &.active { - margin-top: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list + margin-top: calc(-1 * var(--#{$prefix}list-group-border-width)); border-top-width: var(--#{$prefix}list-group-border-width); } } @@ -155,7 +155,7 @@ border-left-width: 0; &.active { - margin-left: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list + margin-left: calc(-1 * var(--#{$prefix}list-group-border-width)); border-left-width: var(--#{$prefix}list-group-border-width); } } diff --git a/scss/_modal.scss b/scss/_modal.scss index d1a1cb767b..fe73fd3b2e 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -9,8 +9,6 @@ @use "vendor/rfs" as *; @use "layout/breakpoints" as *; -// stylelint-disable function-disallowed-list - // .modal-open - body class for killing the scroll // .modal - container to scroll within // .modal-dialog - positioning shell for the actual modal diff --git a/scss/_nav.scss b/scss/_nav.scss index 4c5531854d..8467677ad4 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -78,7 +78,7 @@ border-bottom: var(--#{$prefix}nav-tabs-border-width) solid var(--#{$prefix}nav-tabs-border-color); .nav-link { - margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list + margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); border: var(--#{$prefix}nav-tabs-border-width) solid transparent; @include border-top-radius(var(--#{$prefix}nav-tabs-border-radius)); @@ -99,7 +99,7 @@ .dropdown-menu { // Make dropdown border overlap tab border - margin-top: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list + margin-top: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // Remove the top rounded corners here since there is a hard edge above the menu @include border-top-radius(0); } diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss index 513198d82d..4572b7d8db 100644 --- a/scss/_offcanvas.scss +++ b/scss/_offcanvas.scss @@ -6,8 +6,6 @@ @use "mixins/backdrop" as *; @use "layout/breakpoints" as *; -// stylelint-disable function-disallowed-list - @layer components { %offcanvas-css-vars { // scss-docs-start offcanvas-css-vars diff --git a/scss/_popover.scss b/scss/_popover.scss index c8370658c4..9449195757 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -64,11 +64,11 @@ .bs-popover-top { > .popover-arrow { - bottom: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + bottom: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); &::before, &::after { - border-width: var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list + border-width: var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; } &::before { @@ -86,13 +86,13 @@ /* rtl:begin:ignore */ .bs-popover-end { > .popover-arrow { - left: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + left: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); width: var(--#{$prefix}popover-arrow-height); height: var(--#{$prefix}popover-arrow-width); &::before, &::after { - border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list + border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; } &::before { @@ -111,11 +111,11 @@ .bs-popover-bottom { > .popover-arrow { - top: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + top: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); &::before, &::after { - border-width: 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); // stylelint-disable-line function-disallowed-list + border-width: 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); } &::before { @@ -136,7 +136,7 @@ left: 50%; display: block; width: var(--#{$prefix}popover-arrow-width); - margin-left: calc(-.5 * var(--#{$prefix}popover-arrow-width)); // stylelint-disable-line function-disallowed-list + margin-left: calc(-.5 * var(--#{$prefix}popover-arrow-width)); content: ""; border-bottom: var(--#{$prefix}popover-border-width) solid var(--#{$prefix}popover-header-bg); } @@ -145,13 +145,13 @@ /* rtl:begin:ignore */ .bs-popover-start { > .popover-arrow { - right: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + right: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); width: var(--#{$prefix}popover-arrow-height); height: var(--#{$prefix}popover-arrow-width); &::before, &::after { - border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); // stylelint-disable-line function-disallowed-list + border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); } &::before { diff --git a/scss/_tables.scss b/scss/_tables.scss index ca8a321bcb..f29cb21348 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -82,7 +82,7 @@ } .table-group-divider { - border-top: calc(#{$table-border-width} * 2) solid $table-group-separator-color; // stylelint-disable-line function-disallowed-list + border-top: calc(#{$table-border-width} * 2) solid $table-group-separator-color; } // diff --git a/scss/_toasts.scss b/scss/_toasts.scss index 9a4bbcb7aa..dc79b2c0ba 100644 --- a/scss/_toasts.scss +++ b/scss/_toasts.scss @@ -68,7 +68,7 @@ @include border-top-radius(calc(var(--#{$prefix}toast-border-radius) - var(--#{$prefix}toast-border-width))); .btn-close { - margin-right: calc(-.5 * var(--#{$prefix}toast-padding-x)); // stylelint-disable-line function-disallowed-list + margin-right: calc(-.5 * var(--#{$prefix}toast-padding-x)); margin-left: var(--#{$prefix}toast-padding-x); } } diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index 13f71a0799..eabeddbe01 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -52,24 +52,24 @@ } .bs-tooltip-top .tooltip-arrow { - bottom: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list + bottom: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); &::before { top: -1px; - border-width: var(--#{$prefix}tooltip-arrow-height) calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list + border-width: var(--#{$prefix}tooltip-arrow-height) calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0; border-top-color: var(--#{$prefix}tooltip-bg); } } /* rtl:begin:ignore */ .bs-tooltip-end .tooltip-arrow { - left: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list + left: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); width: var(--#{$prefix}tooltip-arrow-height); height: var(--#{$prefix}tooltip-arrow-width); &::before { right: -1px; - border-width: calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height) calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list + border-width: calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height) calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0; border-right-color: var(--#{$prefix}tooltip-bg); } } @@ -77,24 +77,24 @@ /* rtl:end:ignore */ .bs-tooltip-bottom .tooltip-arrow { - top: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list + top: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); &::before { bottom: -1px; - border-width: 0 calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height); // stylelint-disable-line function-disallowed-list + border-width: 0 calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height); border-bottom-color: var(--#{$prefix}tooltip-bg); } } /* rtl:begin:ignore */ .bs-tooltip-start .tooltip-arrow { - right: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list + right: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); width: var(--#{$prefix}tooltip-arrow-height); height: var(--#{$prefix}tooltip-arrow-width); &::before { left: -1px; - border-width: calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0 calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height); // stylelint-disable-line function-disallowed-list + border-width: calc(var(--#{$prefix}tooltip-arrow-width) * .5) 0 calc(var(--#{$prefix}tooltip-arrow-width) * .5) var(--#{$prefix}tooltip-arrow-height); border-left-color: var(--#{$prefix}tooltip-bg); } } diff --git a/scss/_variables.scss b/scss/_variables.scss index e825c63f88..775a281340 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -629,7 +629,7 @@ $input-focus-box-shadow: $input-btn-focus-box-shadow !default; $input-placeholder-color: var(--#{$prefix}secondary-color) !default; $input-plaintext-color: var(--#{$prefix}body-color) !default; -$input-height-border: calc(#{$input-border-width} * 2) !default; // stylelint-disable-line function-disallowed-list +$input-height-border: calc(#{$input-border-width} * 2) !default; $input-height-inner: calc($input-line-height * 1em + ($input-padding-y * 2)) !default; $input-height-inner-half: calc($input-line-height * .5em + ($input-padding-y)) !default; @@ -954,7 +954,7 @@ $dropdown-bg: var(--#{$prefix}body-bg) !default; $dropdown-border-color: var(--#{$prefix}border-color-translucent) !default; $dropdown-border-radius: var(--#{$prefix}border-radius) !default; $dropdown-border-width: var(--#{$prefix}border-width) !default; -$dropdown-inner-border-radius: calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; // stylelint-disable-line function-disallowed-list +$dropdown-inner-border-radius: calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; $dropdown-divider-bg: $dropdown-border-color !default; $dropdown-divider-margin-y: $spacer * .5 !default; $dropdown-box-shadow: var(--#{$prefix}box-shadow) !default; @@ -1011,7 +1011,7 @@ $pagination-color: var(--#{$prefix}link-color) !default; $pagination-bg: var(--#{$prefix}body-bg) !default; $pagination-border-radius: var(--#{$prefix}border-radius) !default; $pagination-border-width: var(--#{$prefix}border-width) !default; -$pagination-margin-start: calc(-1 * #{$pagination-border-width}) !default; // stylelint-disable-line function-disallowed-list +$pagination-margin-start: calc(-1 * #{$pagination-border-width}) !default; $pagination-border-color: var(--#{$prefix}border-color) !default; $pagination-focus-color: var(--#{$prefix}link-hover-color) !default; @@ -1147,7 +1147,7 @@ $popover-max-width: 276px !default; $popover-border-width: var(--#{$prefix}border-width) !default; $popover-border-color: var(--#{$prefix}border-color-translucent) !default; $popover-border-radius: var(--#{$prefix}border-radius-lg) !default; -$popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list +$popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; $popover-box-shadow: var(--#{$prefix}box-shadow) !default; $popover-header-font-size: $font-size-base !default; diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss index 155e02c855..c3b43d0516 100644 --- a/scss/forms/_input-group.scss +++ b/scss/forms/_input-group.scss @@ -128,7 +128,7 @@ } > :not(:first-child):not(.dropdown-menu)#{$validation-messages} { - margin-left: calc(-1 * #{$input-border-width}); // stylelint-disable-line function-disallowed-list + margin-left: calc(-1 * #{$input-border-width}); @include border-start-radius(0); } diff --git a/scss/layout/_containers.scss b/scss/layout/_containers.scss index ac42be2bdb..8b20c3b159 100644 --- a/scss/layout/_containers.scss +++ b/scss/layout/_containers.scss @@ -10,8 +10,8 @@ --#{$prefix}gutter-x: #{$gutter}; --#{$prefix}gutter-y: 0; width: 100%; - padding-right: calc(var(--#{$prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list - padding-left: calc(var(--#{$prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list + padding-right: calc(var(--#{$prefix}gutter-x) * .5); + padding-left: calc(var(--#{$prefix}gutter-x) * .5); margin-right: auto; margin-left: auto; } diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss index 57f4ce8a88..cf7704bbca 100644 --- a/scss/layout/_grid.scss +++ b/scss/layout/_grid.scss @@ -62,8 +62,8 @@ --#{$prefix}gap: #{$grid-gutter-width}; display: grid; - grid-auto-flow: row; grid-template-columns: repeat(auto-fit, minmax(0, 1fr)); + grid-auto-flow: row; gap: var(--#{$prefix}gap); } diff --git a/scss/layout/index.scss b/scss/layout/index.scss index 16303b4ac8..d848b9ff68 100644 --- a/scss/layout/index.scss +++ b/scss/layout/index.scss @@ -1,3 +1,3 @@ @import "breakpoints"; @import "containers"; -@import "grid"; \ No newline at end of file +@import "grid"; diff --git a/site/src/assets/examples/blog/blog.css b/site/src/assets/examples/blog/blog.css index cc5fc7473a..ed9332d778 100644 --- a/site/src/assets/examples/blog/blog.css +++ b/site/src/assets/examples/blog/blog.css @@ -1,5 +1,3 @@ -/* stylelint-disable selector-list-comma-newline-after */ - .blog-header { border-bottom: 1px solid #e5e5e5; } @@ -13,7 +11,12 @@ text-decoration: none; } -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { font-family: "Playfair Display", Georgia, "Times New Roman", serif/*rtl:Amiri, Georgia, "Times New Roman", serif*/; } diff --git a/site/src/assets/examples/blog/blog.rtl.css b/site/src/assets/examples/blog/blog.rtl.css index fc03c35a31..292639cff5 100644 --- a/site/src/assets/examples/blog/blog.rtl.css +++ b/site/src/assets/examples/blog/blog.rtl.css @@ -1,5 +1,3 @@ -/* stylelint-disable selector-list-comma-newline-after */ - .blog-header { border-bottom: 1px solid #e5e5e5; } @@ -13,7 +11,12 @@ text-decoration: none; } -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { font-family: Amiri, Georgia, "Times New Roman", serif; } diff --git a/site/src/scss/_component-examples.scss b/site/src/scss/_component-examples.scss index 0fd3cbf3de..9877f72177 100644 --- a/site/src/scss/_component-examples.scss +++ b/site/src/scss/_component-examples.scss @@ -103,13 +103,13 @@ .fixed-top, .sticky-top { position: static; - margin: calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1) var(--bd-example-padding); // stylelint-disable-line function-disallowed-list + margin: calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1) var(--bd-example-padding); } .fixed-bottom, .sticky-bottom { position: static; - margin: var(--bd-example-padding) calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1); // stylelint-disable-line function-disallowed-list + margin: var(--bd-example-padding) calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1); } diff --git a/site/src/scss/_content.scss b/site/src/scss/_content.scss index 2ccb4d2b51..7dea1e7f00 100644 --- a/site/src/scss/_content.scss +++ b/site/src/scss/_content.scss @@ -78,11 +78,12 @@ } // Prevent breaking of code - // stylelint-disable-next-line selector-max-compound-selectors + // stylelint-disable selector-max-compound-selectors th, td:first-child > code { white-space: nowrap; } + // stylelint-enable selector-max-compound-selectors } } diff --git a/site/src/scss/_syntax.scss b/site/src/scss/_syntax.scss index 6ab4c8d047..ad0489dc5b 100644 --- a/site/src/scss/_syntax.scss +++ b/site/src/scss/_syntax.scss @@ -2,6 +2,8 @@ @use "../../../scss/colors" as *; @use "../../../scss/mixins/color-mode" as *; +// stylelint-disable selector-no-qualifying-type + :root, [data-bs-theme="light"] { // --base00: #fff;