mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of github.com:twitter/bootstrap into dev

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2011-10-31 23:22:13 -07:00
parent 98007b8394 8f726dc6ef
commit a21363a749
20 changed files with 549 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/forms.less
View File

@@ -255,7 +255,9 @@ textarea.xxlarge {
// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
.formColumns(@columnSpan: 1) {
display: inline-block;
float: none;
width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
margin-left: 0;
}
input,
textarea {