aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-22 17:12:22 -0700
committerMark Otto <[email protected]>2012-03-22 17:12:22 -0700
commitb59cb505f8cf4e0010f422f0a83d9c001055cbd7 (patch)
tree334b36865d127c338432137bb9cbdab2ebaa70a9 /docs/assets
parentfa1b3bdda479e4c419826e2e56fcddb90d6c3519 (diff)
parent99e96f64f7dbaba8c83d7d69e64247969765b9e8 (diff)
downloadbootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.tar.xz
bootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.zip
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/bootstrap.zipbin55574 -> 55584 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css8
-rw-r--r--docs/assets/css/bootstrap.css10
3 files changed, 11 insertions, 7 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 693969290..a7b695041 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 0bc6de916..b007300c2 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -19,9 +19,11 @@
clear: both;
}
.hide-text {
- overflow: hidden;
- text-indent: 100%;
- white-space: nowrap;
+ border: 0;
+ font: 0/0 a;
+ text-shadow: none;
+ color: transparent;
+ background-color: transparent;
}
.input-block-level {
display: block;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e29bfbf70..4796e1288 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -113,9 +113,11 @@ textarea {
clear: both;
}
.hide-text {
- overflow: hidden;
- text-indent: 100%;
- white-space: nowrap;
+ border: 0;
+ font: 0/0 a;
+ text-shadow: none;
+ color: transparent;
+ background-color: transparent;
}
.input-block-level {
display: block;
@@ -2866,7 +2868,7 @@ input[type="submit"].btn.btn-mini {
font-size: 20px;
font-weight: 200;
line-height: 1;
- color: #ffffff;
+ color: #999999;
}
.navbar .navbar-text {
margin-bottom: 0;