aboutsummaryrefslogtreecommitdiff
path: root/docs/examples
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-03 21:50:03 -0800
committerMark Otto <[email protected]>2014-03-03 21:50:03 -0800
commit2ece8dd33616bc2e7f753d108810df7eeac7c3a9 (patch)
tree88376b4fca645a8c2fa6267d301d92c0bf639919 /docs/examples
parentb22f064c2ee38dbd84635d91b8a809a8923f5bfd (diff)
parente381635b1faf7480bcf54618804a62dd4a049a93 (diff)
downloadbootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.tar.xz
bootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.zip
Merge branch 'master' into rtl_via_css_flip
Diffstat (limited to 'docs/examples')
-rw-r--r--docs/examples/cover/cover.css1
-rw-r--r--docs/examples/sticky-footer-navbar/index.html2
-rw-r--r--docs/examples/sticky-footer-navbar/sticky-footer-navbar.css4
-rw-r--r--docs/examples/sticky-footer/index.html2
-rw-r--r--docs/examples/sticky-footer/sticky-footer.css2
5 files changed, 6 insertions, 5 deletions
diff --git a/docs/examples/cover/cover.css b/docs/examples/cover/cover.css
index fb478ed09..9fcc9274f 100644
--- a/docs/examples/cover/cover.css
+++ b/docs/examples/cover/cover.css
@@ -84,6 +84,7 @@ body {
.masthead-nav > li > a:hover,
.masthead-nav > li > a:focus {
background-color: transparent;
+ border-bottom-color: #a9a9a9;
border-bottom-color: rgba(255,255,255,.25);
}
.masthead-nav > .active > a,
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index dbce0806c..9c7566ed6 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -71,7 +71,7 @@
<p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
</div>
- <div id="footer">
+ <div class="footer">
<div class="container">
<p class="text-muted">Place sticky footer content here.</p>
</div>
diff --git a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css
index 76ac2ec89..ee8038063 100644
--- a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css
+++ b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css
@@ -8,7 +8,7 @@ body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}
-#footer {
+.footer {
position: absolute;
bottom: 0;
width: 100%;
@@ -29,7 +29,7 @@ body > .container {
margin: 20px 0;
}
-#footer > .container {
+.footer > .container {
padding-right: 15px;
padding-left: 15px;
}
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index a1d30106f..5788cd5c9 100644
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -37,7 +37,7 @@
<p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
</div>
- <div id="footer">
+ <div class="footer">
<div class="container">
<p class="text-muted">Place sticky footer content here.</p>
</div>
diff --git a/docs/examples/sticky-footer/sticky-footer.css b/docs/examples/sticky-footer/sticky-footer.css
index 8e9adcfaa..b6699e80e 100644
--- a/docs/examples/sticky-footer/sticky-footer.css
+++ b/docs/examples/sticky-footer/sticky-footer.css
@@ -8,7 +8,7 @@ body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}
-#footer {
+.footer {
position: absolute;
bottom: 0;
width: 100%;