saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

saltstack2 sphinx theme updates

Browse source
This commit is contained in:
Jacob Hammons 2015-05-17 20:39:24 -06:00
parent e7442d3b1e
commit 46eb2655ee
5 changed files with 146 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/_themes/saltstack2/layout.html vendored
View file

@ -166,25 +166,25 @@
<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="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="Latest docs from the develop branch" href="/en/develop/">Develop </a> {% if build_type == "develop" %}<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">
<li><a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Watch SaltStack Videos on YouTube" href="https://www.youtube.com/user/SaltStack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/youtube-variation.png', 1) }}" /></a></li>
<li><a data-container="body" 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-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-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-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="bottom" title="Watch SaltStack Videos on YouTube" href="https://www.youtube.com/user/SaltStack" target="_blank"><img class="nolightbox" width="24px" src="{{ pathto('_static/images/youtube-variation.png', 1) }}" /></a></li>
<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-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-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-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-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>
<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="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">
@ -199,6 +199,8 @@
{% endblock %}
</div>
</div> <!--end sidebar wrapper-->
<div id="page-content-wrapper">
<div class="container-fluid">

11
doc/_themes/saltstack2/static/css/basic.css vendored
View file

@ -413,9 +413,9 @@ dd {
margin-left: 30px;
}
dt:target, .highlighted {
/*dt:target, .highlighted {
background-color: #fbe54e;
}
}*/
dl.glossary dt {
font-weight: bold;
@ -533,10 +533,11 @@ div.literal-block-wrapper div.highlight {
margin: 0;
}
code.descname {
/*code.descname {
background-color: transparent;
font-weight: bold;
font-size: 1.2em;
*//*font-size: 1.2em;*//*
font-size: 1.5em;
}
code.descclassname {
@ -546,7 +547,7 @@ code.descclassname {
code.xref, a code {
background-color: transparent;
font-weight: bold;
}
}*/
h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
background-color: transparent;

6
doc/_themes/saltstack2/static/css/main.css vendored
View file

@ -479,11 +479,11 @@ SaltStack custom styles
/* Code blocks */
pre {
/*pre {
position: relative;
border-top-width: 4px;
padding-top: 18px; /* :before height */
}
padding-top: 18px; *//* :before height *//*
}*/
.highlight-bash,
.highlight-jinja,

101
doc/_themes/saltstack2/static/css/webhelp.min.css vendored
View file

@ -1,6 +1,6 @@
/*webhelp*/
body{font-family:"Lato",Helvetica,Arial,sans-serif;background-color:#fff;color:#1e2934}
body{font-family:"Lato",Helvetica,Arial,sans-serif;background-color:#fff;/*color:#1e2934;*/color:#676767}
.footer{padding-top:50px}
a{color:#428bca;text-decoration:none}
a:hover,a:focus{color:#2a6496;text-decoration:underline}
@ -17,20 +17,20 @@ td img{max-width:none}
img.center{display:block;margin:auto}
.jumbotron h1{font-weight:300;text-transform:none}
.jumbotron{background-color:#171717;color:#fff;text-shadow:#000 .1em .1em .1em}
.jumbotron .glyphicon{color:#0CF;font-weight:100;webkit-font-smoothing: subpixel-antialiased;padding-right:10px;font-size:smaller}
.jumbotron .glyphicon{color:#48b4fb;font-weight:100;;padding-right:10px;font-size:smaller}
.panel-title a{font-weight:300}
.panel-heading{padding:20px}
.panel-group a{text-decoration:none}
.list-group-item{border:none;padding-left:25px}
.list-group-item a{color:#333;display:list-item}
h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{color:#0CF;text-transform:uppercase}
h1,.h1{font-size:40px;margin-top:10px;margin-bottom:30px}
h2,.h2{font-size:23px}
h3,.h3{font-size:18px;color:#C0392B}
h4,.h4{font-size:16px;font-style:italic;color:#C0392B}
h5,.h5{font-size:16px;font-weight:300;webkit-font-smoothing: subpixel-antialiased}
h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{text-transform:uppercase}
h1,.h1,h1 > code.docutils.literal{color:#48b4fb;font-size:40px;margin-top:10px;margin-bottom:30px}
h2,.h2,h2 > code.docutils.literal{color:#48b4fb;font-size:23px}
h3,.h3,h3 > code.docutils.literal{font-size:18px}
h4,.h4,h4 > code.docutils.literal{font-size:16px}
h5,.h5,h5 > code.docutils.literal{font-size:16px;font-style:italic}
.subhead{color:#C0392B;font-size:16px;text-transform:uppercase}
.reference h3{font-size:16pt;line-height:1.9;color:#D75400;webkit-font-smoothing: subpixel-antialiased;font-weight:300}
.reference h3{font-size:16pt;line-height:1.9;color:#D75400;;font-weight:300}
.head3 h2{font-size:21px;color:#C0392B}
.head4 h2{font-size:16px;color:#C0392B}
.btn-primary{color:#fff;background-color:#424242;border-color:#080808}
@ -40,8 +40,8 @@ button#next-button{float:right;margin:15px 0 0 0}
button#prev-button{float:left;margin:15px 0 0 0}
.inner-addon{position:relative}
.inner-addon .glyphicon{position:absolute;padding:10px;pointer-events:none}
.glyphicon{color:#C0392B;webkit-font-smoothing: subpixel-antialiased;font-weight:100}
#next-button .glyphicon,#prev-button .glyphicon{color:#0CF}
.glyphicon{color:#C0392B;;font-weight:100}
#next-button .glyphicon,#prev-button .glyphicon{color:#48b4fb}
.left-addon .glyphicon{padding:28px 0 0;left:10px}
.right-addon .glyphicon{padding:30px 0 0;right:5px}
.left-addon input{padding-left:30px}
@ -52,7 +52,7 @@ button#prev-button{float:left;margin:15px 0 0 0}
#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}
#wrapper.toggled #sidebar-wrapper{width:250px}
#page-content-wrapper{width:95%;padding:15px;font-size:15px;line-height:1.7;color:#333}
#page-content-wrapper{width:95%;padding:15px;font-size:15px;line-height:1.7}
#wrapper.toggled #page-content-wrapper{position:absolute;margin-left:-250px}
@media(min-width:768px) {
#wrapper{padding-right:250px}
@ -106,7 +106,7 @@ button#prev-button{float:left;margin:15px 0 0 0}
.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:#0CF}
.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}
@ -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;webkit-font-smoothing: subpixel-antialiased;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 {
@ -153,7 +153,7 @@ ul.nav.collapsed{
#expanded-nav{
font-size: 12pt;
font-weight:300;
webkit-font-smoothing: subpixel-antialiased;
;
}
#expanded-nav li{
@ -178,33 +178,80 @@ ul.nav.collapsed li{
}
#lnav-title{
font-weight:300;
webkit-font-smoothing: subpixel-antialiased;
;
font-size:16pt;
text-align:center;
}
code, pre {
padding: 0 3px 2px;
pre {
border-top-width: 4px;
padding-top: 18px; :before height
}
code {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-size: 12px;
color: #333333;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
code {
padding: 2px 4px;
color: #d14;
white-space: nowrap;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
background-color: rgba( 0, 0, 0, .1 );
}
code.xref {
color: #4070a0;
}
code.descclassname {
color: rgb(51, 51, 51);
background-color: transparent;
border: none;
}
code.descname {
background-color: transparent;
font-weight: bold;
/*font-size: 1.2em;*/
font-size: 1.5em;
}
dl.function {
margin-bottom:40px;
/*border-top: 1px solid #d14;*/
border-top: 1px solid #eee;
padding: 20px;
}
h1 > code.docutils.literal{font-size:40px;margin-top:10px;margin-bottom:30px}
.sidebar-nav li a.selected {font-weight:bold}
a.current.reference.internal {
/*color: #48b4fb;*/
background-color: rgba( 0, 0, 0, .1 );
background-color: #424242;
color: #fff;
padding: 2px 4px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
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;
}*/

58
doc/_themes/saltstack2/static/js/webhelp.min.js vendored
View file

@ -54,6 +54,23 @@ $( document ).ready(function() {
});
if ($( 'a.current' ).length) {
var tgt = $( 'a.current' );
tgt.after('<ul id="function-list"></ul>');
$('dt .headerlink').each(function(idx, elem) {
var i = [
'<li><a class="function-nav-link" href="', elem.href, '">',
last(elem.href.split('.')),
'</a></li>']
.join('');
$( '#function-list' ).append(i);
});
}
/*scroll the right-hand navigation*/
var wheight = $( window ).height() - 245;
$(function(){
@ -61,7 +78,20 @@ $( document ).ready(function() {
width: 'inherit',
height: wheight
}).promise().done(function() {
if ($( 'a.current' ).length) {
if (window.location.hash) {
var hash = window.location.hash.substring(1);
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 });
}
else if ($( 'a.current' ).length) {
var scrollTo_val = $( 'a.current' ).offset().top - 300 + 'px';
$( '.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 });
}
@ -78,9 +108,10 @@ $( document ).ready(function() {
});
/*smooth on-page scrolling for long topic*/
$('a[href^="#"]').on('click',function (e) {
$( '.sidebar-nav' ).on('click','a[href^="#"]',function (e) {
e.preventDefault();
$( '.sidebar-nav' ).find( 'a' ).removeClass('selected');
$(this).addClass('selected');
var target = this.hash;
var $target = $(target);
@ -91,13 +122,26 @@ $( document ).ready(function() {
});
});
$( '.sidebar-nav' ).on('click','a.function-nav-link',function (e) {
e.preventDefault();
$( 'a.function-nav-link' ).removeClass('selected');
$(this).addClass('selected');
var target = this.hash.substring(1);
var $target = $('dt[id="' + target + '"]');
$('html, body').stop().animate({
'scrollTop': $target.offset().top
}, 900, 'swing', function () {
window.location.hash = target;
});
});
/*search form*/
$( '#search-form' ).find( 'input' ).keypress(function(e) {
if(e.which == 13) {
var searchterm = encodeURIComponent($(this).val());
$(this).val("");
/*window.location.href = 'search.html?q=' + encodeURIComponent($(this).val());*/
window.location.href = 'https://www.google.com/cse?cx=004624818632696854117:yfmprrbw3pk&q=' + searchterm;
}
});
@ -109,8 +153,6 @@ $( document ).ready(function() {
});
}); // $.document.ready
//refresh on window resize
@ -135,3 +177,7 @@ function resizeend() {
}
}
}
function last(list) {
return list[list.length - 1];
}