github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	less/forms.less
This commit is contained in:
Mark Otto
2013-05-09 17:22:48 -07:00
parent a19fda699d 1fdfee8de0
commit 90e4ff73d2
3 changed files with 31 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
less/forms.less
View File

@@ -370,12 +370,8 @@ select:focus:invalid {
.input-group-btn,
.input-group input {
display: table-cell;
/*margin: 0;*/
border-radius: 0;
&.input-small {
border-radius: 0;
}
&.input-large {
&:not(:first-child):not(:last-child) {
border-radius: 0;
}
}
@@ -398,40 +394,34 @@ select:focus:invalid {
text-shadow: 0 1px 0 #fff;
background-color: @gray-lighter;
border: 1px solid #ccc;
border-radius: @border-radius-base;
&.input-small {
padding: @padding-small;
font-size: @font-size-small;
}
border-radius: @border-radius-small; }
&.input-large {
padding: @padding-large;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
}
// Reset rounded corners
.input-group input:first-child,
.input-group-addon:first-child {
.border-left-radius(@border-radius-base);
&.input-small {
.border-left-radius(@border-radius-small);
}
&.input-large {
.border-left-radius(@border-radius-large);
}
.input-group-addon:first-child,
.input-group-btn:first-child > .btn:first-child,
.input-group-btn:first-child > .dropdown-toggle:first-child {
.border-right-radius(0);
}
.input-group-addon:first-child {
border-right: 0;
}
.input-group input:last-child,
.input-group-addon:last-child {
.border-right-radius(@border-radius-base);
&.input-small {
.border-right-radius(@border-radius-small);
}
&.input-large {
.border-right-radius(@border-radius-large);
}
.input-group-addon:last-child,
.input-group-btn:last-child > .btn:last-child,
.input-group-btn:last-child > .dropdown-toggle {
.border-left-radius(0);
}
.input-group-addon:last-child {
border-left: 0;
@@ -446,7 +436,6 @@ select:focus:invalid {
.input-group-btn > .btn {
position: relative;
float: left; // Collapse white-space
border-radius: 0;
+ .btn {
margin-left: -1px;
}
@@ -457,29 +446,6 @@ select:focus:invalid {
}
}
// Prepended buttons
.input-group-btn:first-child {
// Round the left corners only
> .btn:first-child,
> .dropdown-toggle:first-child {
.border-left-radius(@border-radius-base);
&.btn-large { .border-left-radius(@border-radius-large); }
&.btn-small { .border-left-radius(@border-radius-small); }
}
}
// Appended buttons
.input-group-btn:last-child {
// Round the right corners only
> .btn:last-child,
> .dropdown-toggle {
.border-right-radius(@border-radius-base);
&.btn-large { .border-right-radius(@border-radius-large); }
&.btn-small { .border-right-radius(@border-radius-small); }
}
}
// Inline forms
// --------------------------------------------------