Commit 06820689 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents d9a662ed 69b7c5a2
4 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1
Showing with 1 addition and 0 deletions
+1 -0
......@@ -381,6 +381,7 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&:active,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment