Skip to content

Commit

Permalink
(less) Merge branch 'pr/13320'
Browse files Browse the repository at this point in the history
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
  • Loading branch information
mdo committed May 1, 2014
2 parents 1cc2ccb + e2a6ec3 commit aa4714e
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,12 @@ input[type="checkbox"],
}


// Reposition feedback icon if label is hidden with "screenreader only" state
.has-feedback label.sr-only ~ .form-control-feedback {
top: 0;
}


// Static form control text
//
// Apply class to a `p` element to make any string of text align with labels in
Expand Down

0 comments on commit aa4714e

Please sign in to comment.