Skip to content

Commit

Permalink
misc fixies
Browse files Browse the repository at this point in the history
  • Loading branch information
Marshall Jones committed Jun 4, 2013
1 parent 0c36360 commit 0a6a6f0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
7 changes: 6 additions & 1 deletion app/lib/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ Balanced.Helpers = (function () {

function calculateContentHeight() {
var $content = $('#content');
if (!$content.length) {
return;
}
var height = $content.height();
var padding = (+$content.css('padding-top').replace('px', '')) + (+$content.css('padding-bottom').replace('px', ''));
return (+height + (+padding)) + 'px';
Expand All @@ -179,7 +182,9 @@ Balanced.Helpers = (function () {

updateNavigationHeight: function () {
var height = calculateContentHeight();
$('#marketplace-nav').height(height);
if (height) {
$('#marketplace-nav').height(height);
}
}
};
})();
Expand Down
6 changes: 3 additions & 3 deletions app/templates/search.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
<li class="timing dropdown label4a">
{{view Balanced.DatePickerView}}
</li>
<li class="download">
<a href="#" {{action download_show}} class="icon-download right">Download</a>
</li>
<!--<li class="download">-->
<!--<a href="#" {{action download_show}} class="icon-download right">Download</a>-->
<!--</li>-->
</nav>
</header>

Expand Down
2 changes: 1 addition & 1 deletion static/less/search.less
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
}
.caret {
position: absolute;
top: 13px;
top: 21px;
right: 22px;
border-top-color: @searchTimingColor;
}
Expand Down

0 comments on commit 0a6a6f0

Please sign in to comment.