Skip to content

Commit 335b0ad

Browse files
committed
Deleted old CSS files. Updated Layout and CSS
2 parents 88c98c6 + 9da39f7 commit 335b0ad

5 files changed

Lines changed: 44 additions & 79 deletions

File tree

docs/theme/deis/layout.html

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<link rel="shortcut icon" href="{{ pathto('_static/favicon.ico', 1) }}">
1717
<script
1818
<script src="{{ pathto('_static/js/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
19+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
20+
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
1921
<meta name='robots' content='noindex,nofollow' />
2022
{%- if pagename == 'index' %}
2123
<link rel="canonical" href="http://deis.io/docs/latest/">
@@ -67,7 +69,11 @@
6769
<div class="span6 hoop">
6870
<div class="doc-content">{% block body %}{% endblock %}</div>
6971
</div>
72+
7073
<div class="span3 docs-sidebar">
74+
{%- block sidebarsearch %}
75+
{%- include "searchbox.html" %}
76+
{%- endblock %}
7177
{{ toctree(collapse=False, maxdepth=3) }}
7278
</div>
7379

@@ -77,13 +83,20 @@
7783
<footer>
7884
</footer>
7985

80-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
81-
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
82-
83-
<script src="http://deis.io/wp-content/themes/deis/js/vendor/bootstrap.min.js"></script>
84-
85-
<script src="http://deis.io/wp-content/themes/deis/js/plugins.js"></script>
86-
<script src="http://deis.io/wp-content/themes/deis/js/main.js"></script>
86+
{%- macro script() %}
87+
<script type="text/javascript">
88+
var DOCUMENTATION_OPTIONS = {
89+
URL_ROOT: '{{ url_root }}',
90+
VERSION: '{{ release|e }}',
91+
COLLAPSE_INDEX: false,
92+
FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
93+
HAS_SOURCE: {{ has_source|lower }}
94+
};
95+
</script>
96+
{%- endmacro %}
97+
<script type="text/javascript" src="{{ pathto('_static/underscore.js', 1) }}" type="text/css"></script>
98+
<script type="text/javascript" src="{{ pathto('_static/doctools.js', 1) }}" type="text/css"></script>
99+
<script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}" type="text/css"></script>
87100

88101
<script>
89102
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];

docs/theme/deis/searchbox.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{#
2+
basic/searchbox.html
3+
~~~~~~~~~~~~~~~~~~~~
4+
5+
Sphinx sidebar template: quick search box.
6+
7+
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
8+
:license: BSD, see LICENSE for details.
9+
#}
10+
{%- if pagename != "search" %}
11+
<div id="searchbox" style="display: none">
12+
<h3>{{ _('Search') }}</h3>
13+
<form class="search" action="{{ pathto('search') }}" method="get">
14+
<input type="text" name="q" />
15+
<input type="submit" value="{{ _('Go') }}" />
16+
<input type="hidden" name="check_keywords" value="yes" />
17+
<input type="hidden" name="area" value="default" />
18+
</form>
19+
<p class="searchtip" style="font-size: 90%">
20+
{{ _('Enter search terms or a module, class or function name.') }}
21+
</p>
22+
</div>
23+
<script type="text/javascript">$('#searchbox').show(0);</script>
24+
{%- endif %}

web/static/css/bootstrap-responsive.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

web/static/css/bootstrap.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)