rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto 2014-12-22 19:30:51 -08:00
commit b615bd938b
9 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
less/forms.less
View file

@ -143,7 +143,7 @@ output {
fieldset[disabled] & {
cursor: @cursor-disabled;
background-color: @input-bg-disabled;
opacity: 1; // iOS fix for unreadable disabled content
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
}
// Reset height for `textarea`s