Skip to content

Commit

Permalink
port theme changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@aqw
aqw committed Feb 5, 2020
1 parent eea2895 commit e991b9f
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 93 deletions.
88 changes: 81 additions & 7 deletions theme/static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ h1 { font-size: 1.8em; }
h2 { font-size: 1.5em; }
h3 { font-size: 1.2em; }

img { max-width: 100%; }

p { margin: 1em 0; }

pre, tt, code {
Expand All @@ -85,6 +87,7 @@ pre, tt, code {
font-family: 'Inconsolata', monospace;
line-height: 1.4;
margin: 0;
overflow-x: auto;
}
pre {
margin: 0.2em 0;
Expand All @@ -95,11 +98,10 @@ tt, code {
}
sup { line-height: 0; }


/*
* Layout
*/
article { margin: 0 4em; }
article { margin: 0 1.5em; }
main {
background: #fff;
display: flex;
Expand All @@ -109,8 +111,9 @@ main {
main #content { flex: 1; }

@media screen and (min-width: 768px) {
article { margin: 0 4em; }
aside {
width: 18em;
width: 17em;
height: 100%;
position: fixed; top: 0; left: 0;
overflow-x: hidden;
Expand All @@ -119,8 +122,9 @@ main #content { flex: 1; }
main {
border: 1px solid #dbdbdb;
border-width: 0 1px;
width: 62em;
position: absolute; top: 0; left: 18em;
width: calc(100% - 17em - 2px);
max-width: 62em;
position: absolute; top: 0; left: 17em;
overflow-x: hidden;
overflow-y: hidden;
}
Expand Down Expand Up @@ -153,7 +157,7 @@ aside nav ul li { list-style: none; }
aside nav ul a {
color: #444;
display: block;
padding: 0 0.5em 0 2em;
padding: 0 0.5em 0 1.5em;
transition: all 0.2s linear;
transition-property: background, color;
}
Expand All @@ -179,6 +183,7 @@ aside nav ul ul ul a { padding-left: 4em; }
text-align: left;
width: 100%;
}
.dc-rack tbody > tr:nth-of-type(odd) { background-color: unset }
.dc-rack th, .dc-rack td {
border: 0;
border-bottom: 1px solid #bbb;
Expand Down Expand Up @@ -225,9 +230,14 @@ h1:hover .headerlink, h2:hover .headerlink, h3:hover .headerlink {
opacity: 1.0;
}

/* a class generated by rst for nested ordered lists */
.loweralpha {
list-style-type: lower-alpha;
}

.searchbox {
border-top: 1px solid #bbb;
margin: 0 2em;
margin: 0 1.5em;
padding: 1em 0;
}
.searchbox input {
Expand All @@ -252,6 +262,48 @@ h1:hover .headerlink, h2:hover .headerlink, h3:hover .headerlink {
padding: 0.5em 1em;
}

/*tables */
table {
border-collapse: collapse;
margin: 0.5em 0 1.5em 0;
width: 100%;
}
thead {
cursor: default;
user-select: none;
text-align: left;
vertical-align: bottom;
}
thead > tr { border-bottom: 2px solid #ddd; }
tbody { vertical-align: top; }
tbody > tr { border-top: 1px solid #ddd; }
tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; }
td, th {
padding: 0.5em 0.7em;
border: 1px solid #ddd;
}
caption {
font-weight: bold;
font-size: 16px;
padding: 0.2em 0.7em;
}

table.footnote {
margin: 0;
width: unset;
}
table.footnote tbody > tr:nth-of-type(odd) { background-color: unset }
table.footnote p:first-child { margin-top: 0 }

@media screen and (min-width: 768px) {
aside nav ul a {
padding: 0 0.5em 0 2em;
}
.searchbox {
margin: 0 2em;
}
}

/*
* State
*/
Expand All @@ -267,3 +319,25 @@ aside nav a.active {
.tipue_search_content_bold { font-weight: bold; }
.tipue_search_content_title { margin-top: 1em; }
.tipue_search_content_text { border-bottom: 1px solid #eee; }
#tipue_search_image_modal { display: none; }

/* Accounts */
table.access {
table-layout: fixed;
}
.access.interdependent tbody tr:first-child {
background-color: #e9e9e9;
border-left: 3px solid #777;
}

/*Data */
table.scroll td {
overflow-x: auto;
}

/*
* Print
*/
@media print {
aside { display: none; }
}
143 changes: 73 additions & 70 deletions theme/static/ts/tipuesearch.min.js
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
(function($){$.fn.tipuesearch=function(options){var set=$.extend({'contentLocation':'tipuesearch/tipuesearch_content.json','contextBuffer':60,'contextLength':60,'contextStart':90,'debug':false,'descriptiveWords':25,'highlightTerms':true,'liveContent':'*','liveDescription':'*','minimumLength':3,'mode':'static','newWindow':false,'show':9,'showContext':true,'showRelated':true,'showTime':true,'showTitleCount':true,'showURL':true,'wholeWords':true},options);return this.each(function(){var tipuesearch_in={pages:[]};$.ajaxSetup({async:false});var tipuesearch_t_c=0;$('#tipue_search_content').hide().html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>').show();if(set.mode=='live')
{for(var i=0;i<tipuesearch_pages.length;i++)
{$.get(tipuesearch_pages[i]).done(function(html)
{var cont=$(set.liveContent,html).text();cont=cont.replace(/\s+/g,' ');var desc=$(set.liveDescription,html).text();desc=desc.replace(/\s+/g,' ');var t_1=html.toLowerCase().indexOf('<title>');var t_2=html.toLowerCase().indexOf('</title>',t_1+7);if(t_1!=-1&&t_2!=-1)
{var tit=html.slice(t_1+7,t_2);}
else
{var tit=tipuesearch_string_1;}
tipuesearch_in.pages.push({"title":tit,"text":desc,"tags":cont,"url":tipuesearch_pages[i]});});}}
if(set.mode=='json')
{$.getJSON(set.contentLocation).done(function(json)
{tipuesearch_in=$.extend({},json);});}
if(set.mode=='static')
{tipuesearch_in=$.extend({},tipuesearch);}
var tipue_search_w='';if(set.newWindow)
(function($){$.fn.tipuesearch=function(options){var set=$.extend({'contextBuffer':60,'contextLength':60,'contextStart':90,'debug':false,'descriptiveWords':25,'footerPages':3,'highlightTerms':true,'imageZoom':true,'minimumLength':3,'newWindow':false,'show':10,'showContext':true,'showRelated':true,'showTime':true,'showTitleCount':true,'showURL':true,'wholeWords':true},options);return this.each(function(){var tipuesearch_t_c=0;var tipue_search_w='';if(set.newWindow)
{tipue_search_w=' target="_blank"';}
function getURLP(name)
{var _locSearch=location.search;var _splitted=(new RegExp('[?|&]'+name+'='+'([^&;]+?)(&|#|;|$)').exec(_locSearch)||[,""]);var searchString=_splitted[1].replace(/\+/g,'%20');try
{var locSearch=location.search;var splitted=(new RegExp('[?|&]'+name+'='+'([^&;]+?)(&|#|;|$)').exec(locSearch)||[,""]);var searchString=splitted[1].replace(/\+/g,'%20');try
{searchString=decodeURIComponent(searchString);}
catch(e)
{searchString=unescape(searchString);}
Expand All @@ -24,7 +11,7 @@ if(getURLP('q'))
$(this).keyup(function(event)
{if(event.keyCode=='13')
{getTipueSearch(0,true);}});function getTipueSearch(start,replace)
{var out='';var show_replace=false;var show_stop=false;var standard=true;var c=0;found=[];var d_o=$('#tipue_search_input').val();var d=d_o.toLowerCase();d=$.trim(d);if((d.match("^\"")&&d.match("\"$"))||(d.match("^'")&&d.match("'$")))
{window.scrollTo(0,0);var out='';var show_replace=false;var show_stop=false;var standard=true;var c=0;var found=[];var d_o=$('#tipue_search_input').val();d_o=d_o.replace(/\+/g,' ').replace(/\s\s+/g,' ');d_o=$.trim(d_o);var d=d_o.toLowerCase();if((d.match("^\"")&&d.match("\"$"))||(d.match("^'")&&d.match("'$")))
{standard=false;}
var d_w=d.split(' ');if(standard)
{d='';for(var i=0;i<d_w.length;i++)
Expand All @@ -48,64 +35,87 @@ var d_t=d;for(var i=0;i<d_w.length;i++)
{for(var f=0;f<tipuesearch_stem.words.length;f++)
{if(d_w[i]==tipuesearch_stem.words[f].word)
{d_t=d_t+' '+tipuesearch_stem.words[f].stem;}}}
d_w=d_t.split(' ');for(var i=0;i<tipuesearch_in.pages.length;i++)
{var score=0;var s_t=tipuesearch_in.pages[i].text;for(var f=0;f<d_w.length;f++)
d_w=d_t.split(' ');for(var i=0;i<tipuesearch.pages.length;i++)
{var score=0;var s_t=tipuesearch.pages[i].text;for(var f=0;f<d_w.length;f++)
{if(set.wholeWords)
{var pat=new RegExp('\\b'+d_w[f]+'\\b','gi');}
else
{var pat=new RegExp(d_w[f],'gi');}
if(tipuesearch_in.pages[i].title.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].title.match(pat).length;score+=(20*m_c);}
if(tipuesearch_in.pages[i].text.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].text.match(pat).length;score+=(20*m_c);}
if(tipuesearch_in.pages[i].tags.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].tags.match(pat).length;score+=(10*m_c);}
if(tipuesearch_in.pages[i].url.search(pat)!=-1)
if(tipuesearch.pages[i].title.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].title.match(pat).length;score+=(20*m_c);}
if(tipuesearch.pages[i].text.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].text.match(pat).length;score+=(20*m_c);}
if(tipuesearch.pages[i].tags)
{if(tipuesearch.pages[i].tags.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].tags.match(pat).length;score+=(10*m_c);}}
if(tipuesearch.pages[i].url.search(pat)!=-1)
{score+=20;}
if(score!=0)
{for(var e=0;e<tipuesearch_weight.weight.length;e++)
{if(tipuesearch_in.pages[i].url==tipuesearch_weight.weight[e].url)
{if(tipuesearch.pages[i].url==tipuesearch_weight.weight[e].url)
{score+=tipuesearch_weight.weight[e].score;}}}
if(d_w[f].match('^-'))
{pat=new RegExp(d_w[f].substring(1),'i');if(tipuesearch_in.pages[i].title.search(pat)!=-1||tipuesearch_in.pages[i].text.search(pat)!=-1||tipuesearch_in.pages[i].tags.search(pat)!=-1)
{pat=new RegExp(d_w[f].substring(1),'i');if(tipuesearch.pages[i].title.search(pat)!=-1||tipuesearch.pages[i].text.search(pat)!=-1||tipuesearch.pages[i].tags.search(pat)!=-1)
{score=0;}}}
if(score!=0)
{found.push({"score":score,"title":tipuesearch_in.pages[i].title,"desc":s_t,"url":tipuesearch_in.pages[i].url});c++;}}}
{found.push({"score":score,"title":tipuesearch.pages[i].title,"desc":s_t,"img":tipuesearch.pages[i].img,"url":tipuesearch.pages[i].url,"note":tipuesearch.pages[i].note});c++;}}}
else
{for(var i=0;i<tipuesearch_in.pages.length;i++)
{var score=0;var s_t=tipuesearch_in.pages[i].text;var pat=new RegExp(d,'gi');if(tipuesearch_in.pages[i].title.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].title.match(pat).length;score+=(20*m_c);}
if(tipuesearch_in.pages[i].text.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].text.match(pat).length;score+=(20*m_c);}
if(tipuesearch_in.pages[i].tags.search(pat)!=-1)
{var m_c=tipuesearch_in.pages[i].tags.match(pat).length;score+=(10*m_c);}
if(tipuesearch_in.pages[i].url.search(pat)!=-1)
{for(var i=0;i<tipuesearch.pages.length;i++)
{var score=0;var s_t=tipuesearch.pages[i].text;var pat=new RegExp(d,'gi');if(tipuesearch.pages[i].title.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].title.match(pat).length;score+=(20*m_c);}
if(tipuesearch.pages[i].text.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].text.match(pat).length;score+=(20*m_c);}
if(tipuesearch.pages[i].tags)
{if(tipuesearch.pages[i].tags.search(pat)!=-1)
{var m_c=tipuesearch.pages[i].tags.match(pat).length;score+=(10*m_c);}}
if(tipuesearch.pages[i].url.search(pat)!=-1)
{score+=20;}
if(score!=0)
{for(var e=0;e<tipuesearch_weight.weight.length;e++)
{if(tipuesearch_in.pages[i].url==tipuesearch_weight.weight[e].url)
{if(tipuesearch.pages[i].url==tipuesearch_weight.weight[e].url)
{score+=tipuesearch_weight.weight[e].score;}}}
if(score!=0)
{found.push({"score":score,"title":tipuesearch_in.pages[i].title,"desc":s_t,"url":tipuesearch_in.pages[i].url});c++;}}}
{found.push({"score":score,"title":tipuesearch.pages[i].title,"desc":s_t,"img":tipuesearch.pages[i].img,"url":tipuesearch.pages[i].url,"note":tipuesearch.pages[i].note});c++;}}}
if(c!=0)
{if(set.showTitleCount&&tipuesearch_t_c==0)
{var title=document.title;document.title='('+c+') '+title;tipuesearch_t_c++;}
if(show_replace)
{out+='<div id="tipue_search_warning">'+tipuesearch_string_2+' '+d+'. '+tipuesearch_string_3+' <a id="tipue_search_replaced">'+d_r+'</a></div>';}
if(c==1)
{out+='<div id="tipue_search_results_count">'+tipuesearch_string_4;}
else
{c_c=c.toString().replace(/\B(?=(\d{3})+(?!\d))/g,",");out+='<div id="tipue_search_results_count">'+c_c+' '+tipuesearch_string_5;}
{var c_c=c.toString().replace(/\B(?=(\d{3})+(?!\d))/g,",");out+='<div id="tipue_search_results_count">'+c_c+' '+tipuesearch_string_5;}
if(set.showTime)
{var endTimer=new Date().getTime();var time=(endTimer-startTimer)/ 1000;out+=' ('+time.toFixed(2)+' '+tipuesearch_string_14+')';set.showTime=false;}
out+='</div>';found.sort(function(a,b){return b.score-a.score});var l_o=0;for(var i=0;i<found.length;i++)
out+='</div>';if(set.showRelated&&standard)
{var ront='';f=0;for(var i=0;i<tipuesearch_related.Related.length;i++)
{if(d==tipuesearch_related.Related[i].search)
{if(!f)
{out+='<div class="tipue_search_related">'+tipuesearch_string_10+': ';}
if(show_replace)
{d_o=d;}
if(tipuesearch_related.Related[i].include)
{var r_d=d_o+' '+tipuesearch_related.Related[i].related;}
else
{var r_d=tipuesearch_related.Related[i].related;}
ront+='<a class="tipue_search_related_btn" id="'+r_d+'">'+tipuesearch_related.Related[i].related+'</a>, ';f++;}}
if(f)
{ront=ront.slice(0,-2);ront+='.</div>';out+=ront;}}
if(show_replace)
{out+='<div id="tipue_search_replace">'+tipuesearch_string_2+' '+d+'. '+tipuesearch_string_3+' <a id="tipue_search_replaced">'+d_r+'</a></div>';}
found.sort(function(a,b){return b.score-a.score});var l_o=0;if(set.imageZoom)
{out+='<div id="tipue_search_image_modal"><div class="tipue_search_image_close">&#10005;</div><div class="tipue_search_image_block"><a id="tipue_search_zoom_url"><img id="tipue_search_zoom_img"></a><div id="tipue_search_zoom_text"></div></div></div>';}
for(var i=0;i<found.length;i++)
{if(l_o>=start&&l_o<set.show+start)
{out+='<div class="tipue_search_content_title"><a href="'+found[i].url+'"'+tipue_search_w+'>'+found[i].title+'</a></div>';if(set.debug)
{out+='<div class="tipue_search_result">';out+='<div class="tipue_search_content_title"><a href="'+found[i].url+'"'+tipue_search_w+'>'+found[i].title+'</a></div>';if(set.debug)
{out+='<div class="tipue_search_content_debug">Score: '+found[i].score+'</div>';}
if(set.showURL)
{var s_u=found[i].url.toLowerCase();if(s_u.indexOf('http://')==0)
{s_u=s_u.slice(7);}
out+='<div class="tipue_search_content_url"><a href="'+found[i].url+'"'+tipue_search_w+'>'+s_u+'</a></div>';}
if(found[i].img)
{if(set.imageZoom)
{out+='<div class="tipue_search_image"><img class="tipue_search_img tipue_search_image_zoom" src="'+found[i].img+'" alt="'+found[i].title+'" data-url="'+found[i].url+'"></div>';}
else
{out+='<div class="tipue_search_image"><a href="'+found[i].url+'"'+tipue_search_w+'><img class="tipue_search_img" src="'+found[i].img+'" alt="'+found[i].title+'"></a></div>';}}
if(found[i].desc)
{var t=found[i].desc;if(set.showContext)
{d_w=d.split(' ');var s_1=found[i].desc.toLowerCase().indexOf(d_w[0]);if(s_1>set.contextStart)
Expand All @@ -124,35 +134,26 @@ else
{t_d+=t_w[f]+' ';}}
t_d=$.trim(t_d);if(t_d.charAt(t_d.length-1)!='.')
{t_d+=' ...';}
t_d=t_d.replace(/h0011/g,'span class=\"tipue_search_content_bold\"');t_d=t_d.replace(/h0012/g,'/span');out+='<div class="tipue_search_content_text">'+t_d+'</div>';}}
t_d=t_d.replace(/h0011/g,'span class=\"tipue_search_content_bold\"');t_d=t_d.replace(/h0012/g,'/span');out+='<div class="tipue_search_content_text">'+t_d+'</div>';}
if(found[i].note)
{out+='<div class="tipue_search_note">'+found[i].note+'</div>';}
out+='</div>';}
l_o++;}
if(set.showRelated&&standard)
{f=0;for(var i=0;i<tipuesearch_related.searches.length;i++)
{if(d==tipuesearch_related.searches[i].search)
{if(show_replace)
{d_o=d;}
if(!f)
{out+='<div class="tipue_search_related_title">'+tipuesearch_string_15+' <span class="tipue_search_related_bold">'+d_o+'</span></div><div class="tipue_search_related_cols">';}
out+='<div class="tipue_search_related_text"><a class="tipue_search_related" id="'+tipuesearch_related.searches[i].related+'">';if(tipuesearch_related.searches[i].before)
{out+='<span class="tipue_search_related_before">'+tipuesearch_related.searches[i].before+'</span> ';}
out+=tipuesearch_related.searches[i].related;if(tipuesearch_related.searches[i].after)
{out+=' <span class="tipue_search_related_after">'+tipuesearch_related.searches[i].after+'</span>';}
out+='</a></div>';f++;}}
if(f)
{out+='</div>';}}
if(c>set.show)
{var pages=Math.ceil(c / set.show);var page=(start / set.show);out+='<nav><div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';if(start>0)
{var pages=Math.ceil(c / set.show);var page=(start / set.show);if(set.footerPages<3)
{set.footerPages=3;}
out+='<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';if(start>0)
{out+='<li role="navigation"><a class="tipue_search_foot_box" accesskey="b" id="'+(start-set.show)+'_'+replace+'">'+tipuesearch_string_6+'</a></li>';}
if(page<=2)
{var p_b=pages;if(pages>3)
{p_b=3;}
{var p_b=pages;if(pages>set.footerPages)
{p_b=set.footerPages;}
for(var f=0;f<p_b;f++)
{if(f==page)
{out+='<li class="current" role="navigation">'+(f+1)+'</li>';}
else
{out+='<li role="navigation"><a class="tipue_search_foot_box" id="'+(f*set.show)+'_'+replace+'">'+(f+1)+'</a></li>';}}}
else
{var p_b=page+2;if(p_b>pages)
{var p_b=page+set.footerPages-1;if(p_b>pages)
{p_b=pages;}
for(var f=page-1;f<p_b;f++)
{if(f==page)
Expand All @@ -161,18 +162,20 @@ else
{out+='<li role="navigation"><a class="tipue_search_foot_box" id="'+(f*set.show)+'_'+replace+'">'+(f+1)+'</a></li>';}}}
if(page+1!=pages)
{out+='<li role="navigation"><a class="tipue_search_foot_box" accesskey="m" id="'+(start+set.show)+'_'+replace+'">'+tipuesearch_string_7+'</a></li>';}
out+='</ul></div></nav>';}}
out+='</ul></div>';}}
else
{out+='<div id="tipue_search_warning">'+tipuesearch_string_8+'</div>';}}
{out+='<div id="tipue_search_error">'+tipuesearch_string_8+'</div>';}}
else
{if(show_stop)
{out+='<div id="tipue_search_warning">'+tipuesearch_string_8+'. '+tipuesearch_string_9+'</div>';}
{out+='<div id="tipue_search_error">'+tipuesearch_string_8+' '+tipuesearch_string_9+'</div>';}
else
{out+='<div id="tipue_search_warning">'+tipuesearch_string_10+'</div>';if(set.minimumLength==1)
{out+='<div id="tipue_search_warning">'+tipuesearch_string_11+'</div>';}
{if(set.minimumLength==1)
{out+='<div id="tipue_search_error">'+tipuesearch_string_11+'</div>';}
else
{out+='<div id="tipue_search_warning">'+tipuesearch_string_12+' '+set.minimumLength+' '+tipuesearch_string_13+'</div>';}}}
{out+='<div id="tipue_search_error">'+tipuesearch_string_12+' '+set.minimumLength+' '+tipuesearch_string_13+'</div>';}}}
$('#tipue_search_content').hide().html(out).slideDown(200);$('#tipue_search_replaced').click(function()
{getTipueSearch(0,false);});$('.tipue_search_related').click(function()
{$('#tipue_search_input').val($(this).attr('id'));getTipueSearch(0,true);});$('.tipue_search_foot_box').click(function()
{getTipueSearch(0,false);});$('.tipue_search_related_btn').click(function()
{$('#tipue_search_input').val($(this).attr('id'));getTipueSearch(0,true);});$('.tipue_search_image_zoom').click(function()
{$('#tipue_search_image_modal').fadeIn(300);$('#tipue_search_zoom_img').attr('src',this.src);var z_u=$(this).attr('data-url');$('#tipue_search_zoom_url').attr('href',z_u);var z_o=this.alt+'<div class="tipue_search_zoom_options"><a href="'+this.src+'" target="_blank">'+tipuesearch_string_15+'</a>&nbsp; <a href="'+z_u+'">'+tipuesearch_string_16+'</a></div>';$('#tipue_search_zoom_text').html(z_o);});$('.tipue_search_image_close').click(function()
{$('#tipue_search_image_modal').fadeOut(300);});$('.tipue_search_foot_box').click(function()
{var id_v=$(this).attr('id');var id_a=id_v.split('_');getTipueSearch(parseInt(id_a[0]),id_a[1]);});}});};})(jQuery);
Loading

0 comments on commit e991b9f

Please sign in to comment.