Skip to content

Commit 1274278

Browse files
bengrunfeldbengrunfeld
committed
Closes #126. Updated RHS sidebar to float right. Updated the social bar to adjust its top margin on page resize. Updated typography in RHS sidebar. Updated social bar to align to bottom of page text. Updated search results page styling.
1 parent f6de3f4 commit 1274278

5 files changed

Lines changed: 84 additions & 93 deletions

File tree

‎docs/theme/deis/layout.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,38 +46,39 @@
4646
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
4747
<![endif]-->
4848

49-
<a class="fork" href="http://github.com/opdemand/deis"><div class="forkImage"></div></a>
5049
<div class="container">
5150
<div class="row">
52-
<div class="span3 column_calc menu">
53-
<div class="nav-border top-spacing">
51+
<div class="span3 column_calc">
52+
<div class="nav-border">
5453
<ul class="nav nav-list menu">
5554
<li><a href="/"><img class="logo" src="{{ pathto('_static/img/menu-logo.png', 1) }}" alt="deis logo"></a></li>
5655
<li class="divider"></li>
57-
<li class="navitem"><a href="http://deis.io/overview/">Overview</a></li>
56+
<li class="navitem overview"><a href="http://deis.io/overview/">Overview</a></li>
5857
<li class="divider"></li>
59-
<li class="navitem"><a href="http://deis.io/get-deis/">Get Deis</a></li>
58+
<li class="navitem get-deis"><a href="http://deis.io/get-deis/">Get Deis</a></li>
6059
<li class="divider"></li>
61-
<li class="navitem"><a href="http://deis.io/get-involved/">Get Involved</a></li>
60+
<li class="navitem get-involved"><a href="http://deis.io/get-involved/">Get Involved</a></li>
6261
<li class="divider"></li>
63-
<li class="navitem selected green"><a href="/">Documentation</a></li>
62+
<li class="navitem documentation selected green"><a href="/">Documentation</a></li>
6463
<li class="divider"></li>
65-
<li class="navitem"><a href="http://deis.io/blog/">Blog</a></li>
64+
<li class="navitem blog"><a href="http://deis.io/blog/">Blog</a></li>
6665
<li class="divider"></li>
6766
<div style="clear:both;"></div>
6867
</ul>
6968

70-
<div class="social-menu">
71-
<a href="https://twitter.com/opendeis" target="_blank"><span class="twitter"></span></a>
72-
<a href="http://freenode.net" target="_blank"><span class="irc"></span></a>
73-
<a href="https://github.com/opdemand/deis" target="_blank"><span class="github"></span></a>
74-
<a href="http://stackoverflow.com/" target="_blank"><span class="stack"></span></a>
75-
</div>
69+
<footer>
70+
<div class="social-menu">
71+
<a href="https://twitter.com/opendeis" target="_blank"><span class="twitter"></span></a>
72+
<a href="http://freenode.net" target="_blank"><span class="irc"></span></a>
73+
<a href="https://github.com/opdemand/deis" target="_blank"><span class="github"></span></a>
74+
<a href="http://stackoverflow.com/" target="_blank"><span class="stack"></span></a>
75+
</div>
7676

77-
<div class="byline-menu">
78-
<span class="cloud-logo"></span>
79-
<p>Deis is a project by<br>OpDemand</p>
80-
</div>
77+
<div class="byline-menu">
78+
<span class="cloud-logo"></span>
79+
<p>Deis is a project by<br>OpDemand</p>
80+
</div>
81+
</footer>
8182
</div>
8283
</div>
8384

@@ -86,7 +87,8 @@
8687
</div>
8788

8889

89-
<div class="span2 offset1 docs-sidebar column_calc">
90+
<div class="span3 docs-sidebar column_calc">
91+
<a class="fork" href="http://github.com/opdemand/deis"><div class="forkImage"></div></a>
9092
<div class="docs-border"></div>
9193
{%- include "searchbox.html" %}
9294
{{ toctree(collapse=False, maxdepth=3) }}
@@ -95,8 +97,6 @@
9597
</div> <!-- .row -->
9698
</div> <!-- .main_section container-->
9799

98-
<footer>
99-
</footer>
100100
<script type="text/javascript">
101101
var DOCUMENTATION_OPTIONS = {
102102
URL_ROOT: '{{ url_root }}',

‎docs/theme/deis/static/searchtools.js‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -466,26 +466,19 @@ var Search = {
466466
Search.status.fadeIn(500);
467467

468468
//Edit by Ben Grunfeld - when search finished, make footer align with bottom of content
469-
function set_columns(is_server_reference) {
470-
is_server_reference = typeof is_server_reference !== 'undefined' ? is_server_reference : false;
471-
var margin = 0;
472-
var maxHeight = 0;
473-
474-
//find the tallest column
475-
$('.column_calc').each(function() {
476-
if (maxHeight < $(this).height()) {
477-
maxHeight = $(this).height();
478-
console.log("M: " + maxHeight + " T: " + $(this).height());
479-
}
480-
});
481-
482-
//511: height of the navigation. 96: height of the footer
483-
if (maxHeight > 923) {margin = maxHeight - 511 - 96;}
484-
if (is_server_reference == true){margin = margin + 80;}
485-
console.log("Max Height: " + maxHeight + " Margin: " + margin);
486-
487-
//Set the margin above the footer
488-
$('.social-menu').css({'margin-top': (margin)});
469+
function set_columns() {
470+
pageHeight = 0;
471+
$('footer').css('margin-top', '0');
472+
$('.nav-border').css('height', '600');
473+
pageHeight = $(document).height();
474+
console.log(pageHeight);
475+
$('.nav-border').css('height', pageHeight);
476+
477+
var margin = pageHeight - 511 - 158;
478+
$('footer').css('margin-top', margin);
479+
480+
if($(window).width() > 1171){$('.docs-sidebar').css({'position': 'absolute', 'right': '0'})};
481+
if($(window).width() < 1171){$('.docs-sidebar').css('position', 'static');}
489482
}
490483
//End BG Edit
491484

0 commit comments

Comments
 (0)