From c31f9022ab95a61ce2cf23df4f4470fa0417ecae Mon Sep 17 00:00:00 2001 From: connors Date: Sat, 11 Jan 2014 21:21:22 -0800 Subject: [PATCH] re-orienting the footer --- _includes/footer.html | 12 ++++-------- _layouts/default.html | 7 ------- components.html | 3 +++ docs-assets/css/docs.css | 11 +++++++---- docs-assets/js/docs.js | 6 +----- lib/sass/docs.scss | 9 +++++++++ 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 0540bfc..bbb3f3b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,8 +1,4 @@ -
-
-
-

License & credit

-

Ratchet is under the the MIT license, meaning you're basically free to use the framework as you please. Ratchet was lovingly crafted by Dave Gamache, Connor Sears, and Jacob Thornton.

-
-
-
\ No newline at end of file +
+

License & credit

+

Ratchet is under the the MIT license, meaning you're basically free to use the framework as you please. Ratchet was lovingly crafted by Dave Gamache, Connor Sears, and Jacob Thornton.

+
diff --git a/_layouts/default.html b/_layouts/default.html index c9f3314..fa4e0fa 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,13 +4,6 @@ {% include header.html %} - - - {{ content }} - - - {% include footer.html %} \ No newline at end of file diff --git a/components.html b/components.html index c6b17c0..82f9077 100644 --- a/components.html +++ b/components.html @@ -1063,6 +1063,9 @@ window.addEventListener('push', myFunction); {% endhighlight %} + + + {% include footer.html %} diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 2c56cac..0c2adcb 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -17,10 +17,6 @@ body { -webkit-text-size-adjust: 100%; } -h1, h2, h3, h4, h5, h6 { - text-rendering: optimizeLegibility; -} - .docs-header-wrapper { background-color: #fafafa; background-image: url("data:image/svg+xml;utf8,"); @@ -160,10 +156,17 @@ h1, h2, h3, h4, h5, h6 { .platform-toggle .segmented-controller { max-width: 300px; margin: 8px auto; + border-color: #bbb; } .platform-toggle .segmented-controller li { cursor: pointer; } +.platform-toggle .segmented-controller li.selected { + background-color: #bbb; +} +.platform-toggle .segmented-controller a { + border-color: #bbb; +} .component { padding: 50px 15px; diff --git a/docs-assets/js/docs.js b/docs-assets/js/docs.js index 8370799..e6c3b60 100644 --- a/docs-assets/js/docs.js +++ b/docs-assets/js/docs.js @@ -84,11 +84,7 @@ $(function() { var contentSectionItem; var currentTop = win.scrollTop(); - // If page is scrolled to bottom near footers - if(pageHeight - currentTop < footerHeight + contentPadding + 1400) { - iphone[0].className = "iphone iphone-bottom"; - iphone[0].setAttribute('style','') - } else if((iphone.initialTop - currentTop) <= iphone.dockingOffset + 41) { + if((iphone.initialTop - currentTop) <= iphone.dockingOffset + 41) { iphone[0].className = "iphone iphone-fixed"; iphone.css({top: iphone.dockingOffset}) } else { diff --git a/lib/sass/docs.scss b/lib/sass/docs.scss index 2ddc9f8..a29bc2b 100644 --- a/lib/sass/docs.scss +++ b/lib/sass/docs.scss @@ -167,9 +167,18 @@ body { .segmented-controller { max-width: 300px; margin: 8px auto; + border-color: #bbb; li { cursor: pointer; + + &.selected { + background-color: #bbb; + } + } + + a { + border-color: #bbb; } } }