2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
This commit is contained in:
Mark Otto
2012-11-04 19:59:07 -08:00
9 changed files with 144 additions and 25 deletions
-4
View File
@@ -26,7 +26,6 @@
&:hover {
color: @grayDark;
text-decoration: none;
background-color: darken(@white, 10%);
background-position: 0 -15px;
// transition is only when going to hover, otherwise the background
@@ -42,8 +41,6 @@
// Active state
&.active,
&:active {
background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9");
background-image: none;
outline: 0;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
@@ -53,7 +50,6 @@
&.disabled,
&[disabled] {
cursor: default;
background-color: darken(@white, 10%);
background-image: none;
.opacity(65);
.box-shadow(none);
+1
View File
@@ -19,6 +19,7 @@ code {
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
white-space: nowrap;
}
// Blocks of code
+1
View File
@@ -214,5 +214,6 @@
// Typeahead
// ---------
.typeahead {
z-index: 1051;
margin-top: 2px; // give it some space to breathe
}
+9 -6
View File
@@ -388,9 +388,9 @@ input[type="checkbox"][readonly] {
// HTML5 invalid states
// Shares styles with the .control-group.error above
input:focus:required:invalid,
textarea:focus:required:invalid,
select:focus:required:invalid {
input:focus:invalid,
textarea:focus:invalid,
select:focus:invalid {
color: #b94a48;
border-color: #ee5f5b;
&:focus {
@@ -489,7 +489,8 @@ select:focus:required:invalid {
border: 1px solid #ccc;
}
.add-on,
.btn {
.btn,
.btn-group > .dropdown-toggle {
vertical-align: top;
border-radius: 0;
}
@@ -516,7 +517,8 @@ select:focus:required:invalid {
select,
.uneditable-input {
border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
+ .btn-group .btn {
+ .btn-group .btn,
+ .btn-group .btn:last-child {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
}
@@ -526,7 +528,8 @@ select:focus:required:invalid {
margin-left: -1px;
}
.add-on:last-child,
.btn:last-child {
.btn:last-child,
.btn-group:last-child > .dropdown-toggle {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
}