diff options
Diffstat (limited to 'scss')
34 files changed, 65 insertions, 34 deletions
diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss index 5d77eeab60..25b9d85a12 100644 --- a/scss/_breadcrumb.scss +++ b/scss/_breadcrumb.scss @@ -27,6 +27,7 @@ + .breadcrumb-item:hover::before { text-decoration: underline; } + // stylelint-disable-next-line no-duplicate-selectors + .breadcrumb-item:hover::before { text-decoration: none; } diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 189036bd30..1a373f3232 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -1,4 +1,4 @@ -// scss-lint:disable QualifyingElement +// stylelint-disable selector-no-qualifying-type // Make the div behave like a button .btn-group, @@ -47,7 +47,8 @@ border-radius: 0; } -// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match +// Set corners individual because sometimes a single button can be in a .btn-group +// and we need :first-child and :last-child to both match .btn-group > .btn:first-child { margin-left: 0; @@ -55,13 +56,15 @@ @include border-right-radius(0); } } -// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it +// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu +// immediately after it .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { @include border-left-radius(0); } -// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group) +// Custom edits for including btn-groups within btn-groups (useful for including +// dropdown buttons within a btn-group) .btn-group > .btn-group { float: left; } diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 1a6d59ec19..d69c159983 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -1,4 +1,4 @@ -// scss-lint:disable QualifyingElement +// stylelint-disable selector-no-qualifying-type // // Base styles diff --git a/scss/_close.scss b/scss/_close.scss index f181490514..897d486844 100644 --- a/scss/_close.scss +++ b/scss/_close.scss @@ -19,11 +19,11 @@ // If you want the anchor version, it requires `href="#"`. // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile -// scss-lint:disable QualifyingElement +// stylelint-disable property-no-vendor-prefix, selector-no-qualifying-type button.close { padding: 0; background: transparent; border: 0; -webkit-appearance: none; } -// scss-lint:enable QualifyingElement +// stylelint-enable diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index f9912606d7..f471be6227 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -1,5 +1,3 @@ -// scss-lint:disable PropertyCount, VendorPrefix - // Embedded icons from Open Iconic. // Released under MIT and copyright 2014 Waybury. // https://useiconic.com/open diff --git a/scss/_forms.scss b/scss/_forms.scss index 69429fdef8..1c661917bc 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -1,4 +1,4 @@ -// scss-lint:disable QualifyingElement, VendorPrefix +// stylelint-disable selector-no-qualifying-type // // Textual form controls diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 8f88b73ec3..91180f1700 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -1,3 +1,5 @@ +// stylelint-disable selector-no-qualifying-type + // // Base styles // @@ -88,13 +90,11 @@ @include border-radius($input-border-radius-lg); } - // scss-lint:disable QualifyingElement // Nuke default margins from checkboxes and radios to vertically center within. input[type="radio"], input[type="checkbox"] { margin-top: 0; } - // scss-lint:enable QualifyingElement } diff --git a/scss/_modal.scss b/scss/_modal.scss index 15e3754b7b..e655850e38 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -90,7 +90,8 @@ .close { padding: $modal-header-padding; - margin: (-$modal-header-padding) (-$modal-header-padding) (-$modal-header-padding) auto; // auto on the left force icon to the right even when there is no .modal-title + // auto on the left force icon to the right even when there is no .modal-title + margin: (-$modal-header-padding) (-$modal-header-padding) (-$modal-header-padding) auto; } } diff --git a/scss/_navbar.scss b/scss/_navbar.scss index a9b6b7b8a6..1398400c03 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -174,14 +174,12 @@ flex-wrap: nowrap; } - // scss-lint:disable ImportantRule .navbar-collapse { - display: flex !important; + display: flex !important; // stylelint-disable-line declaration-no-important // Changes flex-bases to auto because of an IE10 bug flex-basis: auto; } - // scss-lint:enable ImportantRule .navbar-toggler { display: none; diff --git a/scss/_print.scss b/scss/_print.scss index 7f8d9900a3..6505d3e947 100644 --- a/scss/_print.scss +++ b/scss/_print.scss @@ -1,4 +1,4 @@ -// scss-lint:disable QualifyingElement +// stylelint-disable declaration-no-important, selector-no-qualifying-type // Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css @@ -14,8 +14,7 @@ *::before, *::after { // Bootstrap specific; comment out `color` and `background` - //color: #000 !important; // Black prints faster: - // http://www.sanbeiji.com/archives/953 + //color: #000 !important; // Black prints faster: http://www.sanbeiji.com/archives/953 text-shadow: none !important; //background: transparent !important; box-shadow: none !important; diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 2bb4904ac1..29008b921d 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -1,4 +1,4 @@ -// scss-lint:disable QualifyingElement, DuplicateProperty, VendorPrefix +// stylelint-disable // Reboot // diff --git a/scss/_transitions.scss b/scss/_transitions.scss index 86c04a5f8b..df5744b25f 100644 --- a/scss/_transitions.scss +++ b/scss/_transitions.scss @@ -1,3 +1,5 @@ +// stylelint-disable selector-no-qualifying-type + .fade { opacity: 0; @include transition($transition-fade); diff --git a/scss/_type.scss b/scss/_type.scss index 8928341da8..b1b8f61cf5 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important, selector-list-comma-newline-after + // // Headings // diff --git a/scss/_variables.scss b/scss/_variables.scss index 35c38cb835..437434ce2f 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -8,6 +8,7 @@ // Color system // +// stylelint-disable $white: #fff !default; $gray-100: #f8f9fa !default; $gray-200: #e9ecef !default; @@ -72,6 +73,7 @@ $theme-colors: map-merge(( "light": $gray-100, "dark": $gray-800 ), $theme-colors); +// stylelint-enable // Set a specific jump point for requesting color jumps $theme-color-interval: 8% !default; @@ -201,9 +203,11 @@ $transition-collapse: height .35s ease !default; // // Font, line-height, and color for body text, headings, and more. +// stylelint-disable value-keyword-case $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; +// stylelint-enable value-keyword-case $font-size-base: 1rem !default; // Assumes the browser default, typically `16px` $font-size-lg: 1.25rem !default; diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index 4b2bddd5d3..022ab91d8a 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -8,7 +8,7 @@ // @at-root { - @-ms-viewport { width: device-width; } + @-ms-viewport { width: device-width; } // stylelint-disable-line at-rule-no-vendor-prefix } html { diff --git a/scss/mixins/_background-variant.scss b/scss/mixins/_background-variant.scss index 54a734dcc8..5860d7384c 100644 --- a/scss/mixins/_background-variant.scss +++ b/scss/mixins/_background-variant.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Contextual backgrounds @mixin bg-variant($parent, $color) { diff --git a/scss/mixins/_float.scss b/scss/mixins/_float.scss index b43116fa6c..48fa8b6d59 100644 --- a/scss/mixins/_float.scss +++ b/scss/mixins/_float.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + @mixin float-left { float: left !important; } diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 808b2cc425..b5612e922e 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -4,10 +4,10 @@ @mixin make-container() { width: 100%; - margin-right: auto; - margin-left: auto; padding-right: ($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2); + margin-right: auto; + margin-left: auto; } diff --git a/scss/mixins/_hover.scss b/scss/mixins/_hover.scss index 72d1804f3b..fd2f1e2cda 100644 --- a/scss/mixins/_hover.scss +++ b/scss/mixins/_hover.scss @@ -1,3 +1,4 @@ +// stylelint-disable indentation @mixin hover { // TODO: re-enable along with mq4-hover-shim // @if $enable-hover-media-query { @@ -8,9 +9,7 @@ // } // } // @else { -// scss-lint:disable Indentation &:hover { @content; } -// scss-lint:enable Indentation // } } diff --git a/scss/mixins/_image.scss b/scss/mixins/_image.scss index fb7d95b54e..0544f0d2a3 100644 --- a/scss/mixins/_image.scss +++ b/scss/mixins/_image.scss @@ -20,6 +20,7 @@ // // Short retina mixin for setting background-image and -size. +// stylelint-disable indentation, media-query-list-comma-newline-after @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { background-image: url($file-1x); @@ -27,8 +28,7 @@ // but doesn't convert dppx=>dpi. // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard. // Compatibility info: https://caniuse.com/#feat=css-media-resolution - @media - only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx + @media only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx only screen and (min-resolution: 2dppx) { // Standardized background-image: url($file-2x); background-size: $width-1x $height-1x; diff --git a/scss/mixins/_list-group.scss b/scss/mixins/_list-group.scss index ba27b5041d..278787bbed 100644 --- a/scss/mixins/_list-group.scss +++ b/scss/mixins/_list-group.scss @@ -6,7 +6,6 @@ background-color: $background; } - //scss-lint:disable QualifyingElement a.list-group-item-#{$state}, button.list-group-item-#{$state} { color: $color; @@ -22,5 +21,4 @@ border-color: $color; } } - // scss-lint:enable QualifyingElement } diff --git a/scss/mixins/_navbar-align.scss b/scss/mixins/_navbar-align.scss index c454a4ffe9..b351660335 100644 --- a/scss/mixins/_navbar-align.scss +++ b/scss/mixins/_navbar-align.scss @@ -1,7 +1,8 @@ // Navbar vertical align // // Vertically center elements in the navbar. -// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin. +// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` +// to calculate the appropriate top margin. // @mixin navbar-vertical-align($element-height) { // margin-top: (($navbar-height - $element-height) / 2); diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss index 4cf9e79c74..71edb0061a 100644 --- a/scss/mixins/_reset-text.scss +++ b/scss/mixins/_reset-text.scss @@ -1,4 +1,3 @@ -// scss-lint:disable DuplicateProperty @mixin reset-text { font-family: $font-family-base; // We deliberately do NOT reset font-size or word-wrap. @@ -6,7 +5,7 @@ font-weight: $font-weight-normal; line-height: $line-height-base; text-align: left; // Fallback for where `start` is not supported - text-align: start; + text-align: start; // stylelint-disable-line declaration-block-no-duplicate-properties text-decoration: none; text-shadow: none; text-transform: none; diff --git a/scss/mixins/_text-emphasis.scss b/scss/mixins/_text-emphasis.scss index 9cd4b6a4f0..58db3e0fc7 100644 --- a/scss/mixins/_text-emphasis.scss +++ b/scss/mixins/_text-emphasis.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Typography @mixin text-emphasis-variant($parent, $color) { diff --git a/scss/mixins/_visibility.scss b/scss/mixins/_visibility.scss index f67fc1c529..fe523d0ee3 100644 --- a/scss/mixins/_visibility.scss +++ b/scss/mixins/_visibility.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Visibility @mixin invisible($visibility) { diff --git a/scss/utilities/_align.scss b/scss/utilities/_align.scss index 4dbbbc2dbc..8b7df9f76c 100644 --- a/scss/utilities/_align.scss +++ b/scss/utilities/_align.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + .align-baseline { vertical-align: baseline !important; } // Browser default .align-top { vertical-align: top !important; } .align-middle { vertical-align: middle !important; } diff --git a/scss/utilities/_background.scss b/scss/utilities/_background.scss index e382d4f90d..3d2e07d699 100644 --- a/scss/utilities/_background.scss +++ b/scss/utilities/_background.scss @@ -1,5 +1,7 @@ +// stylelint-disable declaration-no-important + @each $color, $value in $theme-colors { - @include bg-variant('.bg-#{$color}', $value); + @include bg-variant(".bg-#{$color}", $value); } .bg-white { diff --git a/scss/utilities/_borders.scss b/scss/utilities/_borders.scss index 3ff603c32a..ba02f04563 100644 --- a/scss/utilities/_borders.scss +++ b/scss/utilities/_borders.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // // Border // diff --git a/scss/utilities/_display.scss b/scss/utilities/_display.scss index 07f3da0b19..893b6387c1 100644 --- a/scss/utilities/_display.scss +++ b/scss/utilities/_display.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // // Utilities for common `display` values // diff --git a/scss/utilities/_flex.scss b/scss/utilities/_flex.scss index b28c0b97de..8e47038436 100644 --- a/scss/utilities/_flex.scss +++ b/scss/utilities/_flex.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Flex variation // // Custom styles for additional flex alignment options. diff --git a/scss/utilities/_position.scss b/scss/utilities/_position.scss index bddae2151c..ef962eddbd 100644 --- a/scss/utilities/_position.scss +++ b/scss/utilities/_position.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Common values // Sass list not in variables since it's not intended for customization. diff --git a/scss/utilities/_sizing.scss b/scss/utilities/_sizing.scss index a7dc3e49b8..e95a4db36a 100644 --- a/scss/utilities/_sizing.scss +++ b/scss/utilities/_sizing.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Width and height @each $prop, $abbrev in (width: w, height: h) { diff --git a/scss/utilities/_spacing.scss b/scss/utilities/_spacing.scss index 150d316312..b2e2354b12 100644 --- a/scss/utilities/_spacing.scss +++ b/scss/utilities/_spacing.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // Margin and Padding @each $breakpoint in map-keys($grid-breakpoints) { diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 7573f2987e..f4b6e65e55 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -1,3 +1,5 @@ +// stylelint-disable declaration-no-important + // // Text // @@ -38,7 +40,7 @@ .text-white { color: #fff !important; } @each $color, $value in $theme-colors { - @include text-emphasis-variant('.text-#{$color}', $value); + @include text-emphasis-variant(".text-#{$color}", $value); } .text-muted { color: $text-muted !important; } |