Author: gjm
Date: Tue Mar 19 20:19:51 2013
New Revision: 1458496
URL: http://svn.apache.org/r1458496
Log:
reduces the sticky area height for large pages, losing the logo and meta nav to
save space - towards #449
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bloodhound-stickyscroll.js
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bloodhound-stickyscroll.js
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bloodhound-stickyscroll.js?rev=1458496&r1=1458495&r2=1458496&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bloodhound-stickyscroll.js
(original)
+++
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bloodhound-stickyscroll.js
Tue Mar 19 20:19:51 2013
@@ -18,7 +18,6 @@
*/
$(document).ready(function stickyStatus() {
-
function stickyLogic() {
var windowHeight = $(window).height();
var headerHeight = $("header").height();
@@ -28,21 +27,18 @@ $(document).ready(function stickyStatus(
var headerTop = $("header").offset().top;
var headerBottom = headerTop + headerHeight - headerStickyHeight;
- var stickyHeight;
if(windowHeight >= 768) {
- headerBottom = 0;
+ headerBottom = headerTop + $("header .nonsticky-header").height();
$("div#breadcrumb-row div").attr('id','oldstickyStatus');
$("div#breadcrumb-row div").removeClass("sticky");
- $('header').attr('id','stickyStatus');
- stickyHeight = $("#stickyStatus").outerHeight();
+ $('header .sticky-header').attr('id','stickyStatus');
}
else {
- $('header').attr('id','oldstickyStatus');
- $("header").removeClass("sticky");
+ $('header .sticky-header').attr('id','oldstickyStatus');
+ $("header .sticky-header").removeClass("sticky");
$("div#breadcrumb-row div").attr('id','stickyStatus');
- stickyHeight = $("#stickyStatus").outerHeight();
}
-
+ var stickyHeight = $("#stickyStatus").outerHeight();
if (docViewTop > headerBottom) {
$("#stickyStatus").addClass("sticky");
$(".stickyOffset").css("height", stickyHeight + "px");
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1458496&r1=1458495&r2=1458496&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
Tue Mar 19 20:19:51 2013
@@ -955,7 +955,7 @@ tt {
}
#stickyStatus h2,
-#stickyStatus ul {
+#stickyStatus ul.breadcrumb {
margin-bottom: 3px;
}
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1458496&r1=1458495&r2=1458496&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
(original)
+++
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Tue Mar 19 20:19:51 2013
@@ -51,7 +51,7 @@
<div class="container">
<!--! header -->
<header>
- <div class="row">
+ <div class="row nonsticky-header">
<!--! logo -->
<div id="logo" class="span4">
<p>
@@ -86,6 +86,7 @@
</div>
</py:with>
</div>
+ <div class="sticky-header">
<!--! search + main nav -->
<div class="row">
<!--! search box -->
@@ -297,6 +298,8 @@
</div>
</div>
</div>
+ <!--! end div.sticky-header -->
+ </div>
</header>
<div class="stickyOffset" style="height: 0px;"></div>
