diff options
| author | Jacob Thornton <[email protected]> | 2011-06-29 15:41:33 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-06-29 15:41:33 -0700 |
| commit | 1561b20f7c0aae9adb40585ab01a9539bd23f01a (patch) | |
| tree | 7d890dde80e803118767111c7e850d3b2d7475c6 /bootstrap-1.0.0.css | |
| parent | e72283ccafaf37996ee44f26fca1e44f1501f53e (diff) | |
| parent | 025f74ef93fadf1f2615789e4560ebf420bf3d6f (diff) | |
| download | bootstrap-1561b20f7c0aae9adb40585ab01a9539bd23f01a.tar.xz bootstrap-1561b20f7c0aae9adb40585ab01a9539bd23f01a.zip | |
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'bootstrap-1.0.0.css')
| -rw-r--r-- | bootstrap-1.0.0.css | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 7c2644cc1..e33fef2bd 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -328,6 +328,9 @@ a:hover { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + transition: 0.1s linear all; } .btn:hover { background-position: 0 -15px; @@ -390,6 +393,11 @@ a:hover { opacity: 0.65; cursor: default; } +.btn:active { + -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); +} button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; @@ -793,7 +801,7 @@ div.input-prepend .add-on, div.input-append .add-on { display: block; width: auto; min-width: 16px; - padding: 5px 4px 5px 5px; + padding: 4px 4px 4px 5px; color: #b3b3b3; font-weight: normal; line-height: 18px; |