valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates to sphinx saltstack2 doc theme

Browse Source
This commit is contained in:
Jacob Hammons 2015-05-19 15:54:28 -06:00
parent ee4c01bf30
commit 31023c8915
6 changed files with 156 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
doc/_themes/saltstack2/layout.html vendored
View File

@ -20,12 +20,19 @@
{%- endif %}
{# Add to top of the list #}
{% set script_files = [
'_static/js/webhelp.min.js',
'_static/js/bootstrap.min.js',
] %}
{% set css_files = [
'_static/css/core.min.css',
'_static/css/webhelp.min.css',
'_static/css/pygments.css',
'_static/css/basic.css',
'_static/css/main.css',
] %}
{%- macro relbar() %}
{%- for rellink in rellinks|reverse %}
@ -41,20 +48,6 @@
{%- endmacro %}
{%- macro sidebar() %}
{%- if render_sidebar %}
<div class="span3">
<div>
{%- block sidebarlogo %}{%- endblock %}
{%- for sidebartemplate in sidebars|default(html_default_sidebars, true) %}
{%- include sidebartemplate %}
{%- endfor %}
</div>
</div>
{%- endif %}
{%- endmacro %}
{%- macro script() %}
<script>
var DOCUMENTATION_OPTIONS = {
@ -74,11 +67,12 @@
{%- macro css() %}
<link rel="stylesheet" href="{{ pathto('_static/css/core.min.css', 1) }}">
<link rel="stylesheet" href="{{ pathto('_static/css/webhelp.min.css', 1) }}">
<link rel="stylesheet" href="{{ pathto('_static/css/pygments.css', 1) }}">
<link rel="stylesheet" href="{{ pathto('_static/css/basic.css', 1) }}">
<link rel="stylesheet" href="{{ pathto('_static/css/main.css', 1) }}">
{%- for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}">
{%- endfor %}
{%- endmacro %}
@ -104,15 +98,15 @@
{%- if not embedded %}
{{ script() }}
{%- if use_opensearch %}
<link rel="search" type="application/opensearchdescription+xml"
title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
href="{{ pathto('_static/opensearch.xml', 1) }}">
{%- endif %}
{%- if use_opensearch %}
<link rel="search" type="application/opensearchdescription+xml"
title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
href="{{ pathto('_static/opensearch.xml', 1) }}">
{%- endif %}
{%- if favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}">
{%- endif %}
{%- if favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}">
{%- endif %}
{%- endif %}
{%- block linktags %}
@ -155,21 +149,20 @@
{%- block content %}
{%- block sidebar1 %}{% endblock %}
<!--start sidebar-->
<div id="wrapper">
<div id="sidebar-wrapper">
<div id="sidebar-static">
<a class="ss-logo" href="http://saltstack.com"><img width="350px" class="nolightbox" src="{{ pathto('_static/images/saltstack_logo.png', 1) }}"></a>
<div id="versions">
{% if on_saltstack %}
<div class="versions">
<a id="latest" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ release }} </a> {% if build_type == "latest" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="latest" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release_version }} </a> {% if build_type == "latest" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="previous" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release_version }} </a> {% if build_type == "previous" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="develop" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Recent doc build from the develop branch" href="/en/develop/">Develop </a> {% if build_type == "develop" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %}
</div>
<div class="text-nowrap">
<!--social icons from http://vervex.deviantart.com/art/Somacro-45-300DPI-Social-Media-Icons-267955425-->
<ul id="social-links" class="list-inline">
@ -177,151 +170,133 @@
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="View the latest SaltStack Tweets" href="http://twitter.com/SaltStackInc" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/twitter.png', 1) }}" /></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Subscribe to the Salt Users mailing list" href="https://groups.google.com/forum/#!forum/salt-users" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/email.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Download SaltStack code from GitHub" href="https://github.com/saltstack/salt" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/github.png', 1) }}" ></a></li>
<li><a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Chat in #salt on Freenode IRC" href="http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" alt="SaltStack on IRC"></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Chat in #salt on Freenode IRC" href="http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" alt="SaltStack on IRC"></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="/r/saltstack" href="http://www.reddit.com/r/saltstack/" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/reddit.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Ask a SaltStack question on StackOverflow" href="http://stackoverflow.com/questions/tagged/salt-stack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/stackoverflow.png', 1) }}" ></a></li><li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Join or start a SaltStack Meetup" href="http://www.meetup.com/find/?keywords=saltstack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/meetup.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Ask a SaltStack question on StackOverflow" href="http://stackoverflow.com/questions/tagged/salt-stack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/stackoverflow.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Join or start a SaltStack Meetup" href="http://www.meetup.com/find/?keywords=saltstack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/meetup.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Follow SaltStack on LinkedIn" href="http://www.linkedin.com/company/salt-stack-inc" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/linkedin.png', 1) }}" ></a></li>
</ul>
</div>
<div id="search-form" class="inner-addon left-addon"><i class="glyphicon glyphicon-search"></i><input type="text" class="form-control"></div>
<div class="sidebar-nav">
{% block menu %}
{% set toctree = toctree(maxdepth=8, collapse=True, includehidden=True) %}
{% if toctree %}
{{ toctree }}
{% else %}
<!-- Local TOC -->
<div class="local-toc">{{ toc }}</div>
<div class="versions">
<p>Version {{ version }}</p>
</div>
{% endif %}
{% endblock %}
<div id="search-form" class="inner-addon left-addon">
<i class="glyphicon glyphicon-search"></i>
<input type="text" class="form-control">
</div>
</div> <!--end sidebar-static-->
<div id="sidebar-nav">
{% block menu %}
{% set toctree = toctree(maxdepth=8, collapse=True, includehidden=True) %}
{% if toctree %}
{{ toctree }}
{% else %}
<!-- Local TOC -->
<div class="local-toc">{{ toc }}</div>
{% endif %}
{% endblock %}
</div>
</div>
<!--end sidebar-->
</div> <!--end sidebar wrapper-->
<div id="page-content-wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12 col-md-11 col-md-offset-1 col-lg-10 col-lg-offset-1">
<!--start navbar-->
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<div class="navbar-header">
<button type="button" class="pull-left navbar-toggle collapsed" id="menu-toggle"><span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span></button>
<button type="button" class="pull-left navbar-toggle collapsed" id="menu-toggle"><span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<ul id="header-nav" class="nav navbar-nav">
{%- block relbar_small %}{{ relbar() }}{% endblock %}
<!--todo: dynamically populate these links-->
<ul id="collapsed-nav" class="nav navbar-nav collapsed">
{%- block relbar_small %}{{ relbar() }}{% endblock %}
<li><a href="/en/getstarted/" target="_blank">Get Started</a></li>
{% if on_saltstack %}
<li><a href="/en/getstarted/" target="_blank">Get Started</a></li>
{% endif %}
{% if build_type == "latest" %}
<li><a class="icon-dl" href="/en/pdf/Salt-{{ release }}.pdf"><img height="25px" width="25px" class="nolightbox" src="{{ pathto('_static/images/pdf_icon.png', 1) }}"></a></li>
<li><a class="icon-dl" href="/en/epub/Salt-{{ release }}.epub"><img height="25px" width="18px" class="nolightbox" src="{{ pathto('_static/images/epub_icon.png', 1) }}"></a></li>
{% elif build_type == "previous" %}
<li><a class="icon-dl" href="/en/pdf/Salt-{{ previous_release_version }}.pdf"><img height="25px" width="25px" class="nolightbox" src="{{ pathto('_static/images/pdf_icon.png', 1) }}"></a></li>
<li><a class="icon-dl" href="/en/epub/Salt-{{ previous_release_version }}.epub"><img height="25px" width="18px" class="nolightbox" src="{{ pathto('_static/images/epub_icon.png', 1) }}"></a></li>
{% endif %}
</ul>
</div>
<div id="expanded-nav" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
{%- block relbar_large %}{{ relbar() }}{% endblock %}
<li><a href="/en/getstarted/" target="_blank">Get Started</a></li>
{% if build_type == "latest" %}
<li><a class="icon-dl" href="/en/pdf/Salt-{{ release }}.pdf"><img height="25px" width="25px" class="nolightbox" src="{{ pathto('_static/images/pdf_icon.png', 1) }}"></a></li>
<li><a class="icon-dl" href="/en/epub/Salt-{{ release }}.epub"><img height="25px" width="18px" class="nolightbox" src="{{ pathto('_static/images/epub_icon.png', 1) }}"></a></li>
{% elif build_type == "previous" %}
<li><a class="icon-dl" href="/en/pdf/Salt-{{ previous_release_version }}.pdf"><img height="25px" width="25px" class="nolightbox" src="{{ pathto('_static/images/pdf_icon.png', 1) }}"></a></li>
<li><a class="icon-dl" href="/en/epub/Salt-{{ previous_release_version }}.epub"><img height="25px" width="18px" class="nolightbox" src="{{ pathto('_static/images/epub_icon.png', 1) }}"></a></li>
{% endif %}
</ul>
</div>
{% if not build_type == "develop" and on_saltstack %}
<li><a class="icon-dl" href="/en/pdf/Salt-{{ release }}.pdf"><img height="25px" width="25px" class="nolightbox" src="{{ pathto('_static/images/pdf_icon.png', 1) }}"></a></li>
<li><a class="icon-dl" href="/en/epub/Salt-{{ release }}.epub"><img height="25px" width="18px" class="nolightbox" src="{{ pathto('_static/images/epub_icon.png', 1) }}"></a></li>
{% endif %}
</ul>
</div>
</nav>
<!--end navbar-->
{%- block document %}
{% block body %} {% endblock %}
{%- endblock %}
{%- if prev %}
<a href="{{ prev.link|e }}"><button data-container="body" data-toggle="tooltip" data-placement="bottom" title="{{ prev.title|striptags|e }}" id="prev-button" type="button" class="btn btn-secondary"><span class="glyphicon glyphicon-chevron-left"></span> Previous</button></a>
{%- endif %}
{%- if next %}
<a href="{{ next.link|e }}"><button data-container="body" data-toggle="tooltip" data-placement="bottom" title="{{ next.title|striptags|e }}" id="next-button" type="button" class="btn btn-primary">
Next <span class="glyphicon glyphicon-chevron-right"></span></button></a>
{%- endif %}
{%- block document %}
{% block body %} {% endblock %}
{%- endblock %}
{%- if prev %}
<a href="{{ prev.link|e }}"><button data-container="body" data-toggle="tooltip" data-placement="bottom" title="{{ prev.title|striptags|e }}" id="prev-button" type="button" class="btn btn-secondary"><span class="glyphicon glyphicon-chevron-left"></span> Previous</button></a>
{%- endif %}
{%- if next %}
<a href="{{ next.link|e }}"><button data-container="body" data-toggle="tooltip" data-placement="bottom" title="{{ next.title|striptags|e }}" id="next-button" type="button" class="btn btn-primary">
Next <span class="glyphicon glyphicon-chevron-right"></span></button></a>
{%- endif %}
</div>
</div> <!--end row-->
</div>
{%- block footer %}
<div class="footer">
<hr />
{% if on_saltstack %}
<div class="row">
<div class="col-sm-6">
{% if build_type == "latest" %}
<p>You are viewing docs for the latest stable release, {{ release }}. Switch to docs for the previous stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release_version }}</a>, or to a recent doc build from the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Latest docs from the develop branch" href="/en/develop/">develop</a> branch.</p>
<p>You are viewing docs for the latest stable release, {{ latest_release_version }}. Switch to docs for the previous stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release_version }}</a>, or to a recent doc build from the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Latest docs from the develop branch" href="/en/develop/">develop</a> branch.</p>
{% elif build_type == "previous" %}
<p>You are viewing docs for the previous stable release, {{ previous_release_version }}. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ release }}</a>, or to a recent doc build from the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Latest docs from the develop branch" href="/en/develop/">develop</a> branch.</p>
<p>You are viewing docs for the previous stable release, {{ previous_release_version }}. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release_version }}</a>, or to a recent doc build from the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Latest docs from the develop branch" href="/en/develop/">develop</a> branch.</p>
{% elif build_type == "develop" %}
<p>You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ release }}</a>, or to docs for the previous stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release_version }}</a>.</p>
<p>You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release_version }}</a>, or to docs for the previous stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release_version }}</a>.</p>
{% endif %}
<br>
<p><a href="saltstack.com">saltstack.com</a></p>
<p><a href="http://saltstack.com">saltstack.com</a></p>
</div>
<div class="col-sm-6">
<p><b>Get Started</b></p>
<p>
New to SaltStack? Try our new <a href="/en/getstarted/">Get Started Guide</a>.
</p>
<p>New to SaltStack? Try our new <a href="/en/getstarted/">Get Started Guide</a>.</p>
<p><b>SaltStack Training</b></p>
<p>
<a href="http://www.saltstack.com/training/">
Now offering remote attendee training!
</a>
</p>
<p><a href="http://www.saltstack.com/training/">Now offering remote attendee training!</a></p>
</div>
</div>
{% endif %}
</div> <!--end footer-->
{%- endblock %}
</div>
</div>
</div> <!--end wrapper-->
{%- endblock %}
{%- endblock %} <!--end block content-->
{% if on_saltstack %}
<!--analytics-->
<script type="text/javascript" language="javascript">llactid=23943</script>
<script type="text/javascript" language="javascript" src="http://t6.trackalyzer.com/trackalyze.js"></script>
@ -339,6 +314,6 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
{% endif %}
</body>
</html>

5
doc/_themes/saltstack2/static/css/basic.css vendored
View File

@ -498,6 +498,11 @@ td.linenos pre {
table.highlighttable {
margin-left: 0.5em;
width:100%;
}
td.code {
width: 100%;
}
table.highlighttable td {

5
doc/_themes/saltstack2/static/css/core.min.css vendored
View File

File diff suppressed because one or more lines are too long

75
doc/_themes/saltstack2/static/css/webhelp.min.css vendored
View File

@ -42,15 +42,15 @@ button#prev-button{float:left;margin:15px 0 0 0}
.inner-addon .glyphicon{position:absolute;padding:10px;pointer-events:none}
.glyphicon{color:#C0392B;;font-weight:100}
#next-button .glyphicon,#prev-button .glyphicon{color:#48b4fb}
.left-addon .glyphicon{padding:28px 0 0;left:10px}
.left-addon .glyphicon{padding:14px 0 0;left:10px}
.right-addon .glyphicon{padding:30px 0 0;right:5px}
.left-addon input{padding-left:30px}
.right-addon input{padding-right:30px}
#search-form{padding:20px 5px 10px}
#search-form{padding:5px 5px 10px}
#wrapper{padding-left:0;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease}
#wrapper.toggled{padding-left:250px}
#sidebar-wrapper{z-index:1000;position:fixed;right:250px;width:0;height:100%;margin-right:-240px;overflow-y:hidden;overflow-x:hidden;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease;background-color:#fff}
.sidebar-nav{position:absolute;top:0;width:250px;font-size:14px}
#sidebar-nav{position:absolute;top:0;width:250px;font-size:14px}
#wrapper.toggled #sidebar-wrapper{width:250px}
#page-content-wrapper{width:95%;padding:15px;font-size:15px;line-height:1.7}
#wrapper.toggled #page-content-wrapper{position:absolute;margin-left:-250px}
@ -61,18 +61,18 @@ button#prev-button{float:left;margin:15px 0 0 0}
#wrapper.toggled #sidebar-wrapper{width:0}
#page-content-wrapper{padding:20px 0 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle,#collapsed-nav{display:none!important}
#menu-toggle{display:none!important}
}
@media(min-width:992px) {
#wrapper{padding-right:300px}
#wrapper.toggled{padding-right:0}
#sidebar-wrapper{width:300px}
.sidebar-nav{width:300px}
#sidebar-nav{width:300px}
#wrapper.toggled #sidebar-wrapper{width:0}
#page-content-wrapper{padding:20px 0 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle,#collapsed-nav{display:none!important}
#menu-toggle{display:none!important}
}
@media(min-width:1200px) {
@ -80,40 +80,40 @@ button#prev-button{float:left;margin:15px 0 0 0}
#sidebar-wrapper{margin-right:-210px}
#wrapper.toggled{padding-right:0}
#sidebar-wrapper{width:350px}
.sidebar-nav{width:300px}
#sidebar-nav{width:300px}
#wrapper.toggled #sidebar-wrapper{width:0}
#page-content-wrapper{padding:20px 0 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle,#collapsed-nav{display:none!important}
#menu-toggle{display:none!important}
}
@media(min-width:1400px) {
#sidebar-wrapper{margin-right:-175px}
#menu-toggle{display:none!important}
}
@media(max-width:768px) {
#sidebar-wrapper{border:1px solid #424242}
}
.sidebar-nav ul{list-style:none;margin:0;padding:0}
.sidebar-nav .collapsed > ul{display:none}
.sidebar-nav .glyphicon{padding-left:5px;font-size:14px}
#header-nav{float:right;text-align:right}
#header-nav li {padding:0 0 15px 15px;font-weight:300}
#sidebar-nav ul{list-style:none;margin:0;padding:0}
#sidebar-nav .collapsed > ul{display:none}
#sidebar-nav .glyphicon{padding-left:5px;font-size:14px}
.nav>li>a:hover,.nav>li>a:focus{background-color:transparent}
.sidebar-nav li a{display:block;text-decoration:none;color:#424242;border-top:1px solid #e3e3e3;font-size:12px}
.sidebar-nav ul li:not(.tocify-item){padding-left:10px}
.sidebar-nav ul a{padding-top:5px;padding-bottom:5px}
.sidebar-nav > ul > .current{min-height:20px;padding:5px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}
.sidebar-nav > ul > .current a{border:none}
.sidebar-nav .tocify li.current > a{font-weight:400;background:#48b4fb}
.sidebar-nav .tocify ul{list-style:circle}
.sidebar-nav .tocify li a{font-weight:400;font-size:14px;background-color:#34495E;padding-left:4px}
#sidebar-nav li a{display:block;text-decoration:none;color:#424242;border-top:1px solid #e3e3e3;font-size:12px}
#sidebar-nav ul li:not(.tocify-item){padding-left:10px}
#sidebar-nav ul a{padding-top:5px;padding-bottom:5px}
#sidebar-nav > ul > .current{min-height:20px;padding:5px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}
#sidebar-nav > ul > .current a{border:none}
#sidebar-nav .tocify li.current > a{font-weight:400;background:#48b4fb}
#sidebar-nav .tocify ul{list-style:circle}
#sidebar-nav .tocify li a{font-weight:400;font-size:14px;background-color:#34495E;padding-left:4px}
.tocify li a{display:block;text-decoration:none;color:#fff;border-bottom:none;font-size:14px;font-weight:300}
#tocify-header0 > li a{border-bottom:1px solid #2C3E50}
ul.tocify-subheader ul li{margin-left:20px}
#gen-links > li.current > .tocify > ul > li > a{font-weight:400;font-size:20px;background:transparent;border-bottom:none;border-top:none;color:#333}
.sidebar-nav li.current:not(.tocify-item) > a{font-weight:400;font-size:20px;border-bottom:none;border-top:none}
#sidebar-nav li.current:not(.tocify-item) > a{font-weight:400;font-size:20px;border-bottom:none;border-top:none}
#gen-links{border-bottom:1px solid #e3e3e3}
#guide-links a{border-top:none;font-size:20px;color:#333}
#guide-links a:hover,a:focus{text-decoration:none}
@ -127,7 +127,7 @@ aside .glyphicon{color:#F4C600}
.important .title{color:#D75400;font-weight:600}
.versionmodified{color:#009276}
#header-links{text-align: center;font-weight:300;padding-top:15px}
#versions{text-align: center;font-weight:300;;border-top:1px solid #e3e3e3;border-bottom:1px solid #e3e3e3;padding:5px}
.versions{text-align: center;font-weight:300;border-top:1px solid #e3e3e3;border-bottom:1px solid #e3e3e3;padding:5px}
.permalink i{color:rgb(255, 255, 255);font-size:14pt;padding-left:5px}
.permalink i:hover{color:#000}
li.toctree-l3.current ul {
@ -173,6 +173,10 @@ ul.nav.collapsed li{
background-color: #fff;
border-color: #fff;
}
.navbar-header {
width: 100%;
}
.open>.dropdown-menu {
width: 100%;
}
@ -222,11 +226,9 @@ dl.function {
padding: 20px;
}
.sidebar-nav li a.selected {font-weight:bold}
#sidebar-nav li a.selected {font-weight:bold}
a.current.reference.internal {
/*color: #48b4fb;*/
background-color: rgba( 0, 0, 0, .1 );
#sidebar-nav a.current.reference.internal {
background-color: #424242;
color: #fff;
padding: 2px 4px;
@ -235,23 +237,8 @@ a.current.reference.internal {
border-radius: 3px;
}
a.current code {
#sidebar-nav a.current code {
color: #fff;
font-size: 14pt;
}
/*.sidebar-nav .a.current code {
color: #fff;
}*/
/*
code {
padding: 0 3px;
background-color: #eee;
*/
/* support: IE8; *//*
background-color: rgba( 0, 0, 0, .1 );
border-radius: 3px;
}*/

18
doc/_themes/saltstack2/static/js/webhelp.min.js vendored
View File

@ -72,28 +72,28 @@ $( document ).ready(function() {
}
/*scroll the right-hand navigation*/
var wheight = $( window ).height() - 245;
var wheight = $( window ).height() - $( '#sidebar-static' ).height();
$(function(){
$( '.sidebar-nav' ).slimScroll({
$( '#sidebar-nav' ).slimScroll({
width: 'inherit',
height: wheight
}).promise().done(function() {
if (window.location.hash) {
var hash = window.location.hash.substring(1);
var $link = $( '.sidebar-nav').find('a[href$="#' + hash + '"]').addClass("selected");
var $link = $( '#sidebar-nav').find('a[href$="#' + hash + '"]').addClass("selected");
if ($link.length) {
var scrollTo_val = $link.offset().top - 300 + 'px';
$( '.sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
else if ($( 'a.current' ).length) {
var scrollTo_val = $( 'a.current' ).offset().top - 300 + 'px';
$( '.sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
}
else if ($( 'a.current' ).length) {
var scrollTo_val = $( 'a.current' ).offset().top - 300 + 'px';
$( '.sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
});
});
@ -108,9 +108,9 @@ $( document ).ready(function() {
});
/*smooth on-page scrolling for long topic*/
$( '.sidebar-nav' ).on('click','a[href^="#"]',function (e) {
$( '#sidebar-nav' ).on('click','a[href^="#"]',function (e) {
e.preventDefault();
$( '.sidebar-nav' ).find( 'a' ).removeClass('selected');
$( '#sidebar-nav' ).find( 'a' ).removeClass('selected');
$(this).addClass('selected');
var target = this.hash;
var $target = $(target);
@ -122,7 +122,7 @@ $( document ).ready(function() {
});
});
$( '.sidebar-nav' ).on('click','a.function-nav-link',function (e) {
$( '#sidebar-nav' ).on('click','a.function-nav-link',function (e) {
e.preventDefault();
$( 'a.function-nav-link' ).removeClass('selected');
$(this).addClass('selected');

17
doc/conf.py
View File

@ -154,7 +154,7 @@ copyright = '2015 SaltStack, Inc.'
version = salt.version.__version__
#release = '.'.join(map(str, salt.version.__version_info__))
release = '2015.5.0'
release = '2015.5.0' # also update release versions in 'html_context'
needs_sphinx = '1.3'
@ -215,7 +215,7 @@ gettext_compact = False
### HTML options
html_theme = 'saltstack2'
html_theme = 'saltstack2' #change to 'saltstack' to use previous theme
html_theme_path = ['_themes']
html_title = u''
html_short_title = 'Salt'
@ -266,6 +266,7 @@ html_context = {
'github_base': 'https://github.com/saltstack/salt',
'github_issues': 'https://github.com/saltstack/salt/issues',
'github_downloads': 'https://github.com/saltstack/salt/downloads',
'latest_release_version': '2015.5.0',
'previous_release_version': '2014.7.6',
'previous_release_dir': '2014.7',
'build_type': 'latest', #latest, previous, develop
@ -289,13 +290,15 @@ latex_elements = {
'inputenc': '', # use XeTeX instead of the inputenc LaTeX package.
'utf8extra': '',
'preamble': '''
\usepackage{fontspec}
\setsansfont{Linux Biolinum O}
\setromanfont{Linux Libertine O}
\setmonofont{Source Code Pro}
\usepackage{fontspec}
\setsansfont{Linux Biolinum O}
\setromanfont{Linux Libertine O}
\setmonofont{Source Code Pro}
''',
}
### Linux Biolinum, Linux Libertine: http://www.linuxlibertine.org/
### Source Code Pro: https://github.com/adobe-fonts/source-code-pro/releases
### Linkcheck options
linkcheck_ignore = [r'http://127.0.0.1',