mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
This commit is contained in:
Jacob Thornton
2011-10-29 17:08:35 -07:00
parent 61937a803b d3b8a96589
commit 9a30b8c05d
13 changed files with 298 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/forms.less
+2
View File
@@ -254,7 +254,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 {