0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Stricter stylelint rules

This commit is contained in:
Martijn Cuppens 2018-06-01 17:00:36 +02:00 committed by XhmikosR
parent f20d0f43fd
commit ffd31f9b8c

View File

@ -8,7 +8,6 @@
// Color system
//
// stylelint-disable
$white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
@ -22,7 +21,9 @@ $gray-900: #212529 !default;
$black: #000 !default;
$grays: () !default;
$grays: map-merge((
// stylelint-disable-next-line scss/dollar-variable-default
$grays: map-merge(
(
"100": $gray-100,
"200": $gray-200,
"300": $gray-300,
@ -32,7 +33,10 @@ $grays: map-merge((
"700": $gray-700,
"800": $gray-800,
"900": $gray-900
), $grays);
),
$grays
);
$blue: #007bff !default;
$indigo: #6610f2 !default;
@ -46,7 +50,9 @@ $teal: #20c997 !default;
$cyan: #17a2b8 !default;
$colors: () !default;
$colors: map-merge((
// stylelint-disable-next-line scss/dollar-variable-default
$colors: map-merge(
(
"blue": $blue,
"indigo": $indigo,
"purple": $purple,
@ -60,7 +66,9 @@ $colors: map-merge((
"white": $white,
"gray": $gray-600,
"gray-dark": $gray-800
), $colors);
),
$colors
);
$primary: $blue !default;
$secondary: $gray-600 !default;
@ -72,7 +80,9 @@ $light: $gray-100 !default;
$dark: $gray-800 !default;
$theme-colors: () !default;
$theme-colors: map-merge((
// stylelint-disable-next-line scss/dollar-variable-default
$theme-colors: map-merge(
(
"primary": $primary,
"secondary": $secondary,
"success": $success,
@ -81,8 +91,9 @@ $theme-colors: map-merge((
"danger": $danger,
"light": $light,
"dark": $dark
), $theme-colors);
// stylelint-enable
),
$theme-colors
);
// Set a specific jump point for requesting color jumps
$theme-color-interval: 8% !default;
@ -114,28 +125,34 @@ $enable-print-styles: true !default;
// variables. Mostly focused on spacing.
// You can add more entries to the $spacers map, should you need more variation.
// stylelint-disable
$spacer: 1rem !default;
$spacers: () !default;
$spacers: map-merge((
// stylelint-disable-next-line scss/dollar-variable-default
$spacers: map-merge(
(
0: 0,
1: ($spacer * .25),
2: ($spacer * .5),
3: $spacer,
4: ($spacer * 1.5),
5: ($spacer * 3)
), $spacers);
),
$spacers
);
// This variable affects the `.h-*` and `.w-*` classes.
$sizes: () !default;
$sizes: map-merge((
// stylelint-disable-next-line scss/dollar-variable-default
$sizes: map-merge(
(
25: 25%,
50: 50%,
75: 75%,
100: 100%,
auto: auto
), $sizes);
// stylelint-enable
),
$sizes
);
// Body
//