diff options
| author | Mark Otto <[email protected]> | 2014-01-24 11:56:04 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-24 11:56:04 -0600 |
| commit | 4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401 (patch) | |
| tree | 5b4bba2ee6e63960b42f22080af5c1cb64bf29c1 | |
| parent | 64e81324261548a8de8cda5fde4b87d0f7a8f8fb (diff) | |
| parent | f1c1469b839d09fbc437de24afef5644b3c80305 (diff) | |
| download | bootstrap-4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401.tar.xz bootstrap-4b2fe3f96f1bc3e4a582a05bb20bf1b2831bb401.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | less/scaffolding.less | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b3aae5138..7d7b0fb6a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,6 +173,7 @@ license your work under the terms of the [MIT License](LICENSE.md). - Attribute selectors should only be used where absolutely necessary (e.g., form controls) and should be avoided on custom components for performance and explicitness. - Series of classes for a component should include a base class (e.g., `.component`) and use the base class as a prefix for modifier and sub-components (e.g., `.component-lg`). - Avoid inheritance and over nesting—use single, explicit classes whenever possible. +- When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast). ### JS diff --git a/less/scaffolding.less b/less/scaffolding.less index c4869139b..2fa0fdec7 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -4,7 +4,10 @@ // Reset the box-sizing - +// +// Heads up! This reset may cause conflicts with some third-party widgets. +// For recommendations on resolving such conflicts, see +// http://getbootstrap.com/getting-started/#third-box-sizing * { .box-sizing(border-box); } |