mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Merge branch 'master' of http://git.local.twitter.com/bootstrap
This commit is contained in:
Vendored
+9
-3
@@ -719,6 +719,12 @@ form .uneditable-input {
|
||||
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
|
||||
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
|
||||
}
|
||||
form :-moz-placeholder {
|
||||
color: #bfbfbf;
|
||||
}
|
||||
form ::-webkit-input-placeholder {
|
||||
color: #bfbfbf;
|
||||
}
|
||||
form input[type=text],
|
||||
form input[type=password],
|
||||
form select,
|
||||
@@ -875,7 +881,7 @@ div.input-prepend .add-on, div.input-append .add-on {
|
||||
height: 18px;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
border: 1px solid #bbb;
|
||||
border: 1px solid #ccc;
|
||||
border-right-width: 0;
|
||||
-webkit-border-radius: 3px 0 0 3px;
|
||||
-moz-border-radius: 3px 0 0 3px;
|
||||
@@ -1610,7 +1616,7 @@ div.twipsy {
|
||||
position: absolute;
|
||||
visibility: visible;
|
||||
padding: 5px;
|
||||
font-size: 10px;
|
||||
font-size: 11px;
|
||||
z-index: 100000;
|
||||
filter: alpha(opacity=80);
|
||||
-khtml-opacity: 0.8;
|
||||
@@ -1650,7 +1656,7 @@ div.twipsy.right .twipsy-arrow {
|
||||
border-right: 5px solid #000;
|
||||
}
|
||||
div.twipsy .twipsy-inner {
|
||||
padding: 5px 8px 4px;
|
||||
padding: 3px 8px;
|
||||
background-color: #000;
|
||||
color: white;
|
||||
text-align: center;
|
||||
|
||||
Reference in New Issue
Block a user