1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 12:21:35 +02:00

Merge branch 'v4-dev' into v4-font-stack

This commit is contained in:
Mark Otto
2016-02-06 15:01:44 -08:00
27 changed files with 785 additions and 652 deletions

View File

@@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
group :development, :test do group :development, :test do
gem 'jekyll', '~> 3.1.0' gem 'jekyll', '~> 3.1.1'
gem 'jekyll-redirect-from', '~> 0.9.1' gem 'jekyll-redirect-from', '~> 0.9.1'
gem 'jekyll-sitemap', '~> 0.10.0' gem 'jekyll-sitemap', '~> 0.10.0'
gem 'sass', '~> 3.4.21' gem 'sass', '~> 3.4.21'

View File

@@ -4,7 +4,7 @@ GEM
colorator (0.1) colorator (0.1)
ffi (1.9.10) ffi (1.9.10)
ffi (1.9.10-x64-mingw32) ffi (1.9.10-x64-mingw32)
jekyll (3.1.0) jekyll (3.1.1)
colorator (~> 0.1) colorator (~> 0.1)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1) jekyll-watch (~> 1.1)
@@ -28,7 +28,7 @@ GEM
mercenary (0.3.5) mercenary (0.3.5)
rake (10.5.0) rake (10.5.0)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.5) rb-inotify (0.9.6)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rouge (1.10.1) rouge (1.10.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
@@ -42,7 +42,7 @@ PLATFORMS
x64-mingw32 x64-mingw32
DEPENDENCIES DEPENDENCIES
jekyll (~> 3.1.0) jekyll (~> 3.1.1)
jekyll-redirect-from (~> 0.9.1) jekyll-redirect-from (~> 0.9.1)
jekyll-sitemap (~> 0.10.0) jekyll-sitemap (~> 0.10.0)
sass (~> 3.4.21) sass (~> 3.4.21)

View File

@@ -25,6 +25,7 @@
<ul class="nav bd-sidenav"> <ul class="nav bd-sidenav">
{% for doc in group.pages %} {% for doc in group.pages %}
{% assign slug = doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' %} {% assign slug = doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' %}
{% capture slug %}/{{ slug }}{% endcapture %}
{% assign active = nil %} {% assign active = nil %}
{% if page.url contains slug %} {% if page.url contains slug %}

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule
// //
// Carbon ads // Carbon ads
// //

View File

@@ -10,13 +10,16 @@
border-left-width: .25rem; border-left-width: .25rem;
border-radius: .25rem; border-radius: .25rem;
} }
.bd-callout h4 { .bd-callout h4 {
margin-top: 0; margin-top: 0;
margin-bottom: .25rem; margin-bottom: .25rem;
} }
.bd-callout p:last-child { .bd-callout p:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.bd-callout code { .bd-callout code {
border-radius: .25rem; border-radius: .25rem;
} }
@@ -31,6 +34,7 @@
h4 { color: $color; } h4 { color: $color; }
} }
.bd-callout-info { @include bs-callout-variant($bd-info); } .bd-callout-info { @include bs-callout-variant($bd-info); }
.bd-callout-warning { @include bs-callout-variant($bd-warning); } .bd-callout-warning { @include bs-callout-variant($bd-warning); }
.bd-callout-danger { @include bs-callout-variant($bd-danger); } .bd-callout-danger { @include bs-callout-variant($bd-danger); }

View File

@@ -1,4 +1,4 @@
// scss-lint:disable IdSelector // scss-lint:disable IdSelector, NestingDepth, SelectorDepth
// //
// Automatically style Markdown-based tables like a Bootstrap `.table`. // Automatically style Markdown-based tables like a Bootstrap `.table`.

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule
.bd-masthead { .bd-masthead {
position: relative; position: relative;
padding: 3rem ($grid-gutter-width / 2) 2rem; padding: 3rem ($grid-gutter-width / 2) 2rem;

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule
.bd-pageheader { .bd-pageheader {
padding: 2rem ($grid-gutter-width / 2); padding: 2rem ($grid-gutter-width / 2);
margin-bottom: 1.5rem; margin-bottom: 1.5rem;

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule
// //
// Responsive tests // Responsive tests
// //
@@ -20,11 +22,11 @@
.responsive-utilities td { .responsive-utilities td {
text-align: center; text-align: center;
} }
.responsive-utilities td.is-visible { .responsive-utilities .is-visible {
color: #468847; color: #468847;
background-color: #dff0d8 !important; background-color: #dff0d8 !important;
} }
.responsive-utilities td.is-hidden { .responsive-utilities .is-hidden {
color: #ccc; color: #ccc;
background-color: #f9f9f9 !important; background-color: #f9f9f9 !important;
} }

View File

@@ -164,23 +164,40 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS
{% highlight scss %} {% highlight scss %}
// Creates a wrapper for a series of columns // Creates a wrapper for a series of columns
@mixin make-row($gutter: $grid-gutter-width) { @mixin make-row($gutter: $grid-gutter-width) {
@if $enable-flex {
display: flex;
flex-wrap: wrap;
} @else {
@include clearfix();
}
margin-left: ($gutter / -2); margin-left: ($gutter / -2);
margin-right: ($gutter / -2); margin-right: ($gutter / -2);
@include clearfix();
} }
// Make the element grid-ready (applying everything but the width) // Make the element grid-ready (applying everything but the width)
@mixin make-col($gutter: $grid-gutter-width) { @mixin make-col($gutter: $grid-gutter-width) {
position: relative; position: relative;
@if $enable-flex {
flex: 1;
} @else {
float: left; float: left;
}
min-height: 1px; min-height: 1px;
padding-left: ($gutter / 2); padding-left: ($gutter / 2);
padding-right: ($gutter / 2); padding-right: ($gutter / 2);
} }
// Set a width (to be used in or out of media queries) @mixin make-col-span($size, $columns: $grid-columns) {
@mixin make-col-span($columns) { // Set a width (to be used in or out of media queries)
width: percentage(($columns / $grid-columns)); @if $enable-flex {
flex: 0 0 percentage($size / $columns);
// Add a `max-width` to ensure content within each column does not blow out
// the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
// do not appear to require this.
max-width: percentage($size / $columns);
} @else {
width: percentage($size / $columns);
}
} }
// Get fancy by offsetting, or changing the sort order // Get fancy by offsetting, or changing the sort order

File diff suppressed because it is too large Load Diff

View File

@@ -42,7 +42,7 @@
"grunt-contrib-connect": "~0.11.2", "grunt-contrib-connect": "~0.11.2",
"grunt-contrib-copy": "~0.8.1", "grunt-contrib-copy": "~0.8.1",
"grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-cssmin": "~0.14.0",
"grunt-contrib-qunit": "~0.7.0", "grunt-contrib-qunit": "~1.0.1",
"grunt-contrib-sass": "^0.9.2", "grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "~0.11.0", "grunt-contrib-uglify": "~0.11.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
@@ -51,7 +51,7 @@
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html": "~5.0.0", "grunt-html": "~5.0.0",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~2.6.0", "grunt-jscs": "~2.7.0",
"grunt-line-remover": "0.0.2", "grunt-line-remover": "0.0.2",
"grunt-postcss": "^0.7.0", "grunt-postcss": "^0.7.0",
"grunt-sass": "^1.0.0", "grunt-sass": "^1.0.0",
@@ -63,7 +63,7 @@
"markdown-it": "^5.0.0", "markdown-it": "^5.0.0",
"mq4-hover-shim": "^0.3.0", "mq4-hover-shim": "^0.3.0",
"npm-shrinkwrap": "^200.1.0", "npm-shrinkwrap": "^200.1.0",
"shelljs": "^0.5.3", "shelljs": "^0.6.0",
"time-grunt": "^1.2.1" "time-grunt": "^1.2.1"
}, },
"engines": { "engines": {

View File

@@ -1,4 +1,16 @@
scss_files: "scss/*.scss" # Default application configuration that all configurations inherit from.
scss_files:
- "**/*.scss"
- "docs/assets/scss/**/*.scss"
plugin_directories: ['.scss-linters']
# List of gem names to load custom linters from (make sure they are already
# installed)
plugin_gems: []
# Default severity of all linters.
severity: warning
linters: linters:
BangFormat: BangFormat:
@@ -6,8 +18,16 @@ linters:
space_before_bang: true space_before_bang: true
space_after_bang: false space_after_bang: false
BemDepth:
enabled: false
max_elements: 1
BorderZero: BorderZero:
enabled: true enabled: true
convention: zero # or `none`
ChainedClasses:
enabled: false
ColorKeyword: ColorKeyword:
enabled: true enabled: true
@@ -17,7 +37,10 @@ linters:
Comment: Comment:
enabled: true enabled: true
exclude: ['_normalize.scss', 'bootstrap.scss'] exclude:
- _normalize.scss
- bootstrap.scss
style: silent
DebugStatement: DebugStatement:
enabled: true enabled: true
@@ -25,9 +48,11 @@ linters:
DeclarationOrder: DeclarationOrder:
enabled: false enabled: false
DisableLinterReason:
enabled: false
DuplicateProperty: DuplicateProperty:
enabled: true enabled: true
exclude: ['mixins/_tab-focus.scss', '_reboot.scss']
ElsePlacement: ElsePlacement:
enabled: true enabled: true
@@ -40,6 +65,9 @@ linters:
EmptyRule: EmptyRule:
enabled: true enabled: true
ExtendDirective:
enabled: false
FinalNewline: FinalNewline:
enabled: true enabled: true
present: true present: true
@@ -59,7 +87,7 @@ linters:
enabled: true enabled: true
ImportantRule: ImportantRule:
enabled: false enabled: true
ImportPath: ImportPath:
enabled: true enabled: true
@@ -68,11 +96,12 @@ linters:
Indentation: Indentation:
enabled: true enabled: true
allow_non_nested_indentation: false
character: space # or 'tab' character: space # or 'tab'
width: 2 width: 2
LeadingZero: LeadingZero:
enabled: false enabled: true
style: exclude_zero # or 'include_zero' style: exclude_zero # or 'include_zero'
MergeableSelector: MergeableSelector:
@@ -82,327 +111,350 @@ linters:
NameFormat: NameFormat:
enabled: true enabled: true
allow_leading_underscore: true allow_leading_underscore: true
convention: hyphenated_lowercase # or 'BEM', or a regex pattern convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
NestingDepth: NestingDepth:
enabled: false enabled: true
max_depth: 4
ignore_parent_selectors: false
PlaceholderInExtend: PlaceholderInExtend:
enabled: false enabled: false
PropertyCount:
enabled: false
include_nested: false
max_properties: 10
PropertySortOrder: PropertySortOrder:
enabled: true enabled: true
ignore_unspecified: false ignore_unspecified: false
severity: warning min_properties: 2
exclude: ['_normalize.scss'] separate_groups: false
order: [ order:
"position", - position
"top", - top
"right", - right
"bottom", - bottom
"left", - left
"z-index", - z-index
"-webkit-box-sizing", - -webkit-box-sizing
"-moz-box-sizing", - -moz-box-sizing
"box-sizing", - box-sizing
"display", - display
"float", - flex
"width", - flex-align
"min-width", - flex-basis
"max-width", - flex-direction
"height", - flex-flow
"min-height", - flex-grow
"max-height", - flex-order
"flex", - flex-pack
"flex-direction", - float
"flex-flow", - width
"flex-order", - min-width
"flex-pack", - max-width
"flex-align", - height
"padding", - min-height
"padding-top", - max-height
"padding-right", - padding
"padding-bottom", - padding-top
"padding-left", - padding-right
"margin", - padding-bottom
"margin-top", - padding-left
"margin-right", - margin
"margin-bottom", - margin-top
"margin-left", - margin-right
"overflow", - margin-bottom
"overflow-x", - margin-left
"overflow-y", - overflow
"-webkit-overflow-scrolling", - overflow-x
"-ms-overflow-x", - overflow-y
"-ms-overflow-y", - -webkit-overflow-scrolling
"-ms-overflow-style", - -ms-overflow-x
"clip", - -ms-overflow-y
"clear", - -ms-overflow-style
"font", - clip
"font-family", - clear
"font-size", - font
"font-style", - font-family
"font-weight", - font-size
"font-variant", - font-style
"font-size-adjust", - font-weight
"font-stretch", - font-variant
"font-effect", - font-size-adjust
"font-emphasize", - font-stretch
"font-emphasize-position", - font-effect
"font-emphasize-style", - font-emphasize
"font-smooth", - font-emphasize-position
"-webkit-hyphens", - font-emphasize-style
"-moz-hyphens", - font-smooth
"hyphens", - -webkit-hyphens
"line-height", - -moz-hyphens
"color", - hyphens
"text-align", - line-height
"-webkit-text-align-last", - color
"-moz-text-align-last", - text-align
"-ms-text-align-last", - -webkit-text-align-last
"text-align-last", - -moz-text-align-last
"text-emphasis", - -ms-text-align-last
"text-emphasis-color", - text-align-last
"text-emphasis-style", - text-emphasis
"text-emphasis-position", - text-emphasis-color
"text-decoration", - text-emphasis-style
"text-indent", - text-emphasis-position
"text-justify", - text-decoration
"text-outline", - text-indent
"-ms-text-overflow", - text-justify
"text-overflow", - text-outline
"text-overflow-ellipsis", - -ms-text-overflow
"text-overflow-mode", - text-overflow
"text-shadow", - text-overflow-ellipsis
"text-transform", - text-overflow-mode
"text-wrap", - text-shadow
"-webkit-text-size-adjust", - text-transform
"-ms-text-size-adjust", - text-wrap
"letter-spacing", - -webkit-text-size-adjust
"-ms-word-break", - -ms-text-size-adjust
"word-break", - letter-spacing
"word-spacing", - -ms-word-break
"-ms-word-wrap", - word-break
"word-wrap", - word-spacing
"-moz-tab-size", - -ms-word-wrap
"-o-tab-size", - word-wrap
"tab-size", - -moz-tab-size
"white-space", - -o-tab-size
"vertical-align", - tab-size
"list-style", - white-space
"list-style-position", - vertical-align
"list-style-type", - list-style
"list-style-image", - list-style-position
"pointer-events", - list-style-type
"-ms-touch-action", - list-style-image
"touch-action", - pointer-events
"cursor", - -ms-touch-action
"visibility", - touch-action
"zoom", - cursor
"table-layout", - visibility
"empty-cells", - zoom
"caption-side", - table-layout
"border-spacing", - empty-cells
"border-collapse", - caption-side
"content", - border-spacing
"quotes", - border-collapse
"counter-reset", - content
"counter-increment", - quotes
"resize", - counter-reset
"-webkit-user-select", - counter-increment
"-moz-user-select", - resize
"-ms-user-select", - -webkit-user-select
"-o-user-select", - -moz-user-select
"user-select", - -ms-user-select
"nav-index", - -o-user-select
"nav-up", - user-select
"nav-right", - nav-index
"nav-down", - nav-up
"nav-left", - nav-right
"background", - nav-down
"background-color", - nav-left
"background-image", - background
"-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient", - background-color
"filter:progid:DXImageTransform.Microsoft.gradient", - background-image
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", - -ms-filter:\\'progid:DXImageTransform.Microsoft.gradient
"filter", - filter:progid:DXImageTransform.Microsoft.gradient
"background-repeat", - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader
"background-attachment", - filter
"background-position", - background-repeat
"background-position-x", - background-attachment
"background-position-y", - background-position
"-webkit-background-clip", - background-position-x
"-moz-background-clip", - background-position-y
"background-clip", - -webkit-background-clip
"background-origin", - -moz-background-clip
"-webkit-background-size", - background-clip
"-moz-background-size", - background-origin
"-o-background-size", - -webkit-background-size
"background-size", - -moz-background-size
"border", - -o-background-size
"border-color", - background-size
"border-style", - border
"border-width", - border-color
"border-top", - border-style
"border-top-color", - border-width
"border-top-style", - border-top
"border-top-width", - border-top-color
"border-right", - border-top-style
"border-right-color", - border-top-width
"border-right-style", - border-right
"border-right-width", - border-right-color
"border-bottom", - border-right-style
"border-bottom-color", - border-right-width
"border-bottom-style", - border-bottom
"border-bottom-width", - border-bottom-color
"border-left", - border-bottom-style
"border-left-color", - border-bottom-width
"border-left-style", - border-left
"border-left-width", - border-left-color
"border-radius", - border-left-style
"border-top-left-radius", - border-left-width
"border-top-right-radius", - border-radius
"border-bottom-right-radius", - border-top-left-radius
"border-bottom-left-radius", - border-top-right-radius
"-webkit-border-image", - border-bottom-right-radius
"-moz-border-image", - border-bottom-left-radius
"-o-border-image", - -webkit-border-image
"border-image", - -moz-border-image
"-webkit-border-image-source", - -o-border-image
"-moz-border-image-source", - border-image
"-o-border-image-source", - -webkit-border-image-source
"border-image-source", - -moz-border-image-source
"-webkit-border-image-slice", - -o-border-image-source
"-moz-border-image-slice", - border-image-source
"-o-border-image-slice", - -webkit-border-image-slice
"border-image-slice", - -moz-border-image-slice
"-webkit-border-image-width", - -o-border-image-slice
"-moz-border-image-width", - border-image-slice
"-o-border-image-width", - -webkit-border-image-width
"border-image-width", - -moz-border-image-width
"-webkit-border-image-outset", - -o-border-image-width
"-moz-border-image-outset", - border-image-width
"-o-border-image-outset", - -webkit-border-image-outset
"border-image-outset", - -moz-border-image-outset
"-webkit-border-image-repeat", - -o-border-image-outset
"-moz-border-image-repeat", - border-image-outset
"-o-border-image-repeat", - -webkit-border-image-repeat
"border-image-repeat", - -moz-border-image-repeat
"outline", - -o-border-image-repeat
"outline-width", - border-image-repeat
"outline-style", - outline
"outline-color", - outline-width
"outline-offset", - outline-style
"-webkit-box-shadow", - outline-color
"-moz-box-shadow", - outline-offset
"box-shadow", - -webkit-box-shadow
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", - -moz-box-shadow
"-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", - box-shadow
"opacity", - filter:progid:DXImageTransform.Microsoft.Alpha(Opacity
"-ms-interpolation-mode", - -ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha
"-webkit-transition", - opacity
"-moz-transition", - -ms-interpolation-mode
"-ms-transition", - -webkit-transition
"-o-transition", - -moz-transition
"transition", - -ms-transition
"-webkit-transition-delay", - -o-transition
"-moz-transition-delay", - transition
"-ms-transition-delay", - -webkit-transition-delay
"-o-transition-delay", - -moz-transition-delay
"transition-delay", - -ms-transition-delay
"-webkit-transition-timing-function", - -o-transition-delay
"-moz-transition-timing-function", - transition-delay
"-ms-transition-timing-function", - -webkit-transition-timing-function
"-o-transition-timing-function", - -moz-transition-timing-function
"transition-timing-function", - -ms-transition-timing-function
"-webkit-transition-duration", - -o-transition-timing-function
"-moz-transition-duration", - transition-timing-function
"-ms-transition-duration", - -webkit-transition-duration
"-o-transition-duration", - -moz-transition-duration
"transition-duration", - -ms-transition-duration
"-webkit-transition-property", - -o-transition-duration
"-moz-transition-property", - transition-duration
"-ms-transition-property", - -webkit-transition-property
"-o-transition-property", - -moz-transition-property
"transition-property", - -ms-transition-property
"-webkit-transform", - -o-transition-property
"-moz-transform", - transition-property
"-ms-transform", - -webkit-transform
"-o-transform", - -moz-transform
"transform", - -ms-transform
"-webkit-transform-origin", - -o-transform
"-moz-transform-origin", - transform
"-ms-transform-origin", - -webkit-transform-origin
"-o-transform-origin", - -moz-transform-origin
"transform-origin", - -ms-transform-origin
"-webkit-animation", - -o-transform-origin
"-moz-animation", - transform-origin
"-ms-animation", - -webkit-animation
"-o-animation", - -moz-animation
"animation", - -ms-animation
"-webkit-animation-name", - -o-animation
"-moz-animation-name", - animation
"-ms-animation-name", - -webkit-animation-name
"-o-animation-name", - -moz-animation-name
"animation-name", - -ms-animation-name
"-webkit-animation-duration", - -o-animation-name
"-moz-animation-duration", - animation-name
"-ms-animation-duration", - -webkit-animation-duration
"-o-animation-duration", - -moz-animation-duration
"animation-duration", - -ms-animation-duration
"-webkit-animation-play-state", - -o-animation-duration
"-moz-animation-play-state", - animation-duration
"-ms-animation-play-state", - -webkit-animation-play-state
"-o-animation-play-state", - -moz-animation-play-state
"animation-play-state", - -ms-animation-play-state
"-webkit-animation-timing-function", - -o-animation-play-state
"-moz-animation-timing-function", - animation-play-state
"-ms-animation-timing-function", - -webkit-animation-timing-function
"-o-animation-timing-function", - -moz-animation-timing-function
"animation-timing-function", - -ms-animation-timing-function
"-webkit-animation-delay", - -o-animation-timing-function
"-moz-animation-delay", - animation-timing-function
"-ms-animation-delay", - -webkit-animation-delay
"-o-animation-delay", - -moz-animation-delay
"animation-delay", - -ms-animation-delay
"-webkit-animation-iteration-count", - -o-animation-delay
"-moz-animation-iteration-count", - animation-delay
"-ms-animation-iteration-count", - -webkit-animation-iteration-count
"-o-animation-iteration-count", - -moz-animation-iteration-count
"animation-iteration-count", - -ms-animation-iteration-count
"-webkit-animation-direction", - -o-animation-iteration-count
"-moz-animation-direction", - animation-iteration-count
"-ms-animation-direction", - -webkit-animation-direction
"-o-animation-direction", - -moz-animation-direction
"animation-direction" - -ms-animation-direction
] - -o-animation-direction
PropertySpelling: PropertySpelling:
enabled: true enabled: true
extra_properties: [] extra_properties: []
disabled_properties: []
PropertyUnits:
enabled: true
global: [
'ch', 'em', 'ex', 'rem', # Font-relative lengths
'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
'vh', 'vw', 'vmin', 'vmax', # Viewport-percentage lengths
'deg', 'grad', 'rad', 'turn', # Angle
'ms', 's', # Duration
'Hz', 'kHz', # Frequency
'dpi', 'dpcm', 'dppx', # Resolution
'%'] # Other
properties: {}
PseudoElement: PseudoElement:
enabled: true enabled: true
QualifyingElement: QualifyingElement:
enabled: false enabled: true
allow_element_with_attribute: false allow_element_with_attribute: false
allow_element_with_class: false allow_element_with_class: false
allow_element_with_id: false allow_element_with_id: false
SelectorDepth: SelectorDepth:
enabled: false enabled: true
max_depth: 4
SelectorFormat: SelectorFormat:
enabled: true enabled: false
convention: hyphenated_lowercase # or 'BEM', or 'snake_case', or 'camel_case', or a regex pattern convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
ignored_types: ["element"]
Shorthand: Shorthand:
enabled: true enabled: true
allowed_shorthands: [1, 2, 3]
SingleLinePerProperty: SingleLinePerProperty:
enabled: true enabled: false
allow_single_line_rule_sets: true allow_single_line_rule_sets: true
SingleLinePerSelector: SingleLinePerSelector:
@@ -410,6 +462,7 @@ linters:
SpaceAfterComma: SpaceAfterComma:
enabled: false enabled: false
style: one_space # or 'no_space', or 'at_least_one_space'
SpaceAfterPropertyColon: SpaceAfterPropertyColon:
enabled: true enabled: true
@@ -418,10 +471,17 @@ linters:
SpaceAfterPropertyName: SpaceAfterPropertyName:
enabled: true enabled: true
SpaceAfterVariableName:
enabled: true
SpaceAroundOperator:
enabled: true
style: one_space # or 'at_least_one_space', or 'no_space'
SpaceBeforeBrace: SpaceBeforeBrace:
enabled: true enabled: true
style: space style: space # or 'new_line'
allow_single_line_padding: true allow_single_line_padding: false
SpaceBetweenParens: SpaceBetweenParens:
enabled: true enabled: true
@@ -429,14 +489,20 @@ linters:
StringQuotes: StringQuotes:
enabled: true enabled: true
style: double_quotes style: double_quotes # or double_quotes
TrailingSemicolon: TrailingSemicolon:
enabled: true enabled: true
TrailingWhitespace:
enabled: true
TrailingZero: TrailingZero:
enabled: false enabled: false
TransitionAll:
enabled: false
UnnecessaryMantissa: UnnecessaryMantissa:
enabled: true enabled: true
@@ -449,11 +515,17 @@ linters:
UrlQuotes: UrlQuotes:
enabled: true enabled: true
VendorPrefixes: VariableForProperty:
enabled: false
properties: []
VendorPrefix:
enabled: true enabled: true
identifier_list: base identifier_list: base
include: [] additional_identifiers: []
exclude: ['_normalize.scss'] excluded_identifiers: []
exclude:
- _normalize.scss
ZeroUnit: ZeroUnit:
enabled: true enabled: true

View File

@@ -1,3 +1,5 @@
// scss-lint:disable QualifyingElement
// Make the div behave like a button // Make the div behave like a button
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {

View File

@@ -1,3 +1,5 @@
// scss-lint:disable QualifyingElement
// //
// Base styles // Base styles
// //

View File

@@ -19,6 +19,8 @@
// iOS requires the button element instead of an anchor tag. // iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`. // If you want the anchor version, it requires `href="#"`.
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
// scss-lint:disable QualifyingElement
button.close { button.close {
padding: 0; padding: 0;
cursor: pointer; cursor: pointer;
@@ -26,3 +28,4 @@ button.close {
border: 0; border: 0;
-webkit-appearance: none; -webkit-appearance: none;
} }
// scss-lint:enable QualifyingElement

View File

@@ -1,3 +1,5 @@
// scss-lint:disable QualifyingElement
// //
// Textual form controls // Textual form controls
// //

View File

@@ -107,11 +107,13 @@
@include border-radius($border-radius-lg); @include border-radius($border-radius-lg);
} }
// scss-lint:disable QualifyingElement
// Nuke default margins from checkboxes and radios to vertically center within. // Nuke default margins from checkboxes and radios to vertically center within.
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin-top: 0; margin-top: 0;
} }
// scss-lint:enable QualifyingElement
} }

View File

@@ -27,6 +27,7 @@
top: -1px; top: -1px;
} }
// scss-lint:disable QualifyingElement
// Add hover effects, but only for links // Add hover effects, but only for links
a.label { a.label {
@include hover-focus { @include hover-focus {
@@ -35,6 +36,7 @@ a.label {
cursor: pointer; cursor: pointer;
} }
} }
// scss-lint:enable QualifyingElement
// Pill labels // Pill labels
// //

View File

@@ -44,6 +44,7 @@
// Use anchor or button elements instead of `li`s or `div`s to create interactive // Use anchor or button elements instead of `li`s or `div`s to create interactive
// list items. Includes an extra `.active` modifier class for selected items. // list items. Includes an extra `.active` modifier class for selected items.
// scss-lint:disable QualifyingElement
a.list-group-item, a.list-group-item,
button.list-group-item { button.list-group-item {
width: 100%; width: 100%;
@@ -61,6 +62,7 @@ button.list-group-item {
background-color: $list-group-hover-bg; background-color: $list-group-hover-bg;
} }
} }
// scss-lint:enable QualifyingElement
.list-group-item { .list-group-item {
// Disabled state // Disabled state

View File

@@ -117,6 +117,7 @@
} }
} }
// scss-lint:disable ImportantRule
// Custom override for // Custom override for
.navbar-toggleable { .navbar-toggleable {
&-xs { &-xs {
@@ -135,6 +136,7 @@
} }
} }
} }
// scss-lint:enable ImportantRule
// Navigation // Navigation

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule, QualifyingElement
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css // Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
// ========================================================================== // ==========================================================================

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule, QualifyingElement, DuplicateProperty
// Reboot // Reboot
// //
// Global resets to common HTML elements and more for easier usage by Bootstrap. // Global resets to common HTML elements and more for easier usage by Bootstrap.

View File

@@ -108,7 +108,7 @@
.table-responsive { .table-responsive {
display: block; display: block;
width: 100%; width: 100%;
min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
overflow-x: auto; overflow-x: auto;
// TODO: find out if we need this still. // TODO: find out if we need this still.
@@ -171,15 +171,14 @@
tbody, tbody,
tfoot { tfoot {
&:last-child { &:last-child {
tr:last-child { tr:last-child th,
th, tr:last-child td {
td {
border-bottom: $table-border-width solid $table-border-color; border-bottom: $table-border-width solid $table-border-color;
} }
} }
} }
}
// scss-lint:disable ImportantRule
tr { tr {
float: left; float: left;
@@ -189,4 +188,5 @@
border: $table-border-width solid $table-border-color; border: $table-border-width solid $table-border-color;
} }
} }
// scss-lint:enable ImportantRule
} }

View File

@@ -369,7 +369,7 @@ $custom-select-border-color: $input-border-color !default;
$custom-select-border-radius: $border-radius !default; $custom-select-border-radius: $border-radius !default;
$custom-select-focus-border-color: #51a7e8 !default; $custom-select-focus-border-color: #51a7e8 !default;
$custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5) !default; $custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default;
$custom-select-sm-padding-y: .2rem !default; $custom-select-sm-padding-y: .2rem !default;
$custom-select-sm-font-size: 75% !default; $custom-select-sm-font-size: 75% !default;
@@ -581,7 +581,7 @@ $popover-arrow-width: 10px !default;
$popover-arrow-color: $popover-bg !default; $popover-arrow-color: $popover-bg !default;
$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default; $popover-arrow-outer-width: ($popover-arrow-width + 1px) !default;
$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; $popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;
// Labels // Labels

View File

@@ -1,3 +1,5 @@
// scss-lint:disable ImportantRule
// //
// Visibility utilities // Visibility utilities
// //