aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-06-29 15:41:33 -0700
committerJacob Thornton <[email protected]>2011-06-29 15:41:33 -0700
commit1561b20f7c0aae9adb40585ab01a9539bd23f01a (patch)
tree7d890dde80e803118767111c7e850d3b2d7475c6 /lib
parente72283ccafaf37996ee44f26fca1e44f1501f53e (diff)
parent025f74ef93fadf1f2615789e4560ebf420bf3d6f (diff)
downloadbootstrap-1561b20f7c0aae9adb40585ab01a9539bd23f01a.tar.xz
bootstrap-1561b20f7c0aae9adb40585ab01a9539bd23f01a.zip
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'lib')
-rw-r--r--lib/forms.less2
-rw-r--r--lib/scaffolding.less8
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/forms.less b/lib/forms.less
index ec6338676..d0f6b0384 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -218,7 +218,7 @@ div.input-append {
display: block;
width: auto;
min-width: 16px;
- padding: 5px 4px 5px 5px;
+ padding: 4px 4px 4px 5px;
color: @grayLight;
font-weight: normal;
line-height: 18px;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index e574ad14f..a8b67e460 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -78,6 +78,7 @@ a {
// Buttons
.btn {
.button();
+ .transition(.1s linear all);
&.primary {
#gradient > .vertical(@blue, @blueDark);
color: #fff;
@@ -102,6 +103,13 @@ a {
.opacity(65);
cursor: default;
}
+ &:focus {
+
+ }
+ &:active {
+ @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
+ .box-shadow(@shadow);
+ }
}
// Help Firefox not be a douche about adding extra padding to buttons
button.btn,