aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-13 14:43:51 -0700
committerMark Otto <[email protected]>2012-07-13 14:43:51 -0700
commit750badabf760d7fb0a68a1a214442ecbdff8a16c (patch)
tree26f4ab15bff09558bc42d1a5008dcdd536ecad49
parent463de252a9d695d6b52045e5e7df4e7b82ffb116 (diff)
downloadbootstrap-750badabf760d7fb0a68a1a214442ecbdff8a16c.tar.xz
bootstrap-750badabf760d7fb0a68a1a214442ecbdff8a16c.zip
copy edits and tweaks to utility classes to ensure they always are specific enough
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--docs/assets/css/docs.css4
-rw-r--r--docs/extend.html2
-rw-r--r--docs/templates/layout.mustache2
-rw-r--r--less/utilities.less5
5 files changed, 11 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 30de241fe..123b2ac33 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5408,11 +5408,11 @@ a.badge:hover {
}
.hide {
- display: none;
+ display: none !important;
}
.show {
- display: block;
+ display: block !important;
}
.invisible {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0a713d626..2c73a78c2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -57,6 +57,10 @@ body > .navbar-fixed-top .brand:hover {
section {
padding-top: 60px;
}
+section > .page-header,
+section > .lead {
+ color: #5a5a5a;
+}
/* Separators (hr) */
.bs-docs-separator {
diff --git a/docs/extend.html b/docs/extend.html
index 8e9b79b6b..df30b679a 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -60,7 +60,7 @@
<li class="">
<a href="./javascript.html">Javascript</a>
</li>
- <li class="">
+ <li class="active">
<a href="./extend.html">Extend</a>
</li>
</ul>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 6ba72e841..3366179de 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -72,7 +72,7 @@
<li class="{{javascript}}">
<a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
</li>
- <li class="{{less}}">
+ <li class="{{extend}}">
<a href="./extend.html">{{_i}}Extend{{/i}}</a>
</li>
</ul>
diff --git a/less/utilities.less b/less/utilities.less
index 35267b305..9d3a405b1 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -12,11 +12,12 @@
}
// Toggling content
+// Uses `!important` for proper specifity over things like form controls
.hide {
- display: none;
+ display: none !important;
}
.show {
- display: block;
+ display: block !important;
}
// Visibility