aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-10 13:04:17 -0700
committerMark Otto <[email protected]>2011-09-10 13:04:17 -0700
commitc797cb61a6a36459b0c3e7b628e22ad3518350e8 (patch)
tree9fad9bf189074224a5a6364f534ffa615c45f55b /lib
parent5b1615015931986b064aa12c222c1059e58f25e5 (diff)
parent79d5f907130a030963b802647e3ed3bcb6300a46 (diff)
downloadbootstrap-c797cb61a6a36459b0c3e7b628e22ad3518350e8.tar.xz
bootstrap-c797cb61a6a36459b0c3e7b628e22ad3518350e8.zip
conflict
Diffstat (limited to 'lib')
-rw-r--r--lib/bootstrap.less2
-rw-r--r--lib/reset.less5
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ff17097dd..364dafa5d 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v1.2.0
+ * Bootstrap v1.3.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
diff --git a/lib/reset.less b/lib/reset.less
index 93fd97ae9..9e2c6befe 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -26,11 +26,6 @@ html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
-// Active links get no outline
-a:active {
- outline: none;
- -moz-outline-style: none;
-}
// Focus states
a:focus {
outline: thin dotted;