diff options
| author | Gijs Boddeus <botje_gijs@hotmail.com> | 2017-10-15 12:55:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-15 12:55:02 +0300 |
| commit | 98778164e04c581bfedab72a9a09b6525261c860 (patch) | |
| tree | 10fe8118ce2dbecdb29c2215b4caba8d7f8ffc87 /assets | |
| parent | 8f483dc4322cc12849eda65246edfb47b5aaad0b (diff) | |
| parent | 3ccb7ef16ad2fa858c767128a5414a0b1bd7fa30 (diff) | |
Merge branch 'v4-dev' into yiq-function-update
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/scss/_brand.scss | 2 | ||||
| -rw-r--r-- | assets/scss/_component-examples.scss | 2 | ||||
| -rw-r--r-- | assets/scss/_content.scss | 2 |
3 files changed, 4 insertions, 2 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`. |