Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2014-02-04 02:01:45 -08:00
commit 1387784d60
3 changed files with 6 additions and 11 deletions

View File

@ -174,6 +174,7 @@ license your work under the terms of the [MIT License](LICENSE.md).
- 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).
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
### JS

View File

@ -16,12 +16,6 @@
"os": "OS X",
"os_version": "Mavericks"
},
{
"browser": "chrome",
"browser_version": "latest",
"os": "OS X",
"os_version": "Mavericks"
},
{
"browser": "firefox",
"browser_version": "latest",

View File

@ -5,11 +5,11 @@
browserName: "safari",
platform: "OS X 10.9"
},
{
browserName: "chrome",
platform: "OS X 10.9",
version: "31"
},
# {
# browserName: "chrome",
# platform: "OS X 10.9",
# version: "31"
# },
{
browserName: "firefox",
platform: "OS X 10.9"