CSS simplification (no visual change hopefully)
This commit is contained in:
Ed Ward
parent
50f1834b65
commit
df596e752f
10
build.py
10
build.py
|
|
@ -312,15 +312,15 @@ def FixInternalLinks(links, content, title):
|
|||
# looking at currently
|
||||
#
|
||||
def BuildList(lst, fs, pagePos, cList):
|
||||
content = '\n\n<dl>\n'
|
||||
content = '\n\n<ul>\n'
|
||||
|
||||
for i in range(len(lst)):
|
||||
curPos = lst[i]
|
||||
nextPos = lst[i + 1] if i + 1 < len(lst) else len(fs)
|
||||
nextPos = lst[i + 1] if i + 1 < len(lst) else len(fs)
|
||||
|
||||
active = ' class=active' if curPos == pagePos else ''
|
||||
menuTitle = fs[curPos]['menu_title'] if 'menu_title' in fs[curPos] else fs[curPos]['title']
|
||||
content = content + '<dt' + active + '><a href="/' + fs[curPos]['filename'] + '/">' + menuTitle + '</a></dt><dd' + active + '>'
|
||||
content = content + '<li' + active + '><a href="/' + fs[curPos]['filename'] + '/">' + menuTitle + '</a></li>'
|
||||
|
||||
# If the current page is our page, and it has children, enumerate them
|
||||
if curPos == pagePos:
|
||||
|
|
@ -332,9 +332,7 @@ def BuildList(lst, fs, pagePos, cList):
|
|||
elif (pagePos > curPos) and (pagePos < nextPos):
|
||||
content = content + BuildList(cList[curPos], fs, pagePos, cList)
|
||||
|
||||
content = content + '</dd>\n'
|
||||
|
||||
content = content + '</dl>\n'
|
||||
content = content + '</ul>\n'
|
||||
|
||||
return content
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
{% tree %}
|
||||
|
||||
</div> <!-- navbar -->
|
||||
</div> <!-- tree -->
|
||||
|
||||
<div class="span12" id="content">
|
||||
<div id="content-main">
|
||||
|
|
|
|||
|
|
@ -18,35 +18,34 @@
|
|||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div id="tree">
|
||||
<div id="tree-inner">
|
||||
<h1 class="title"><a href="/"><img class="img-responsive" src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
|
||||
|
||||
<form id="custom-search-form" class="navbar-form" method="post" action="https://duckduckgo.com">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" placeholder="Search …" name="q">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-default" type="button" onclick="window.location.href='/ardourmanual.html'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="sites" value="manual.ardour.org"><!-- domain -->
|
||||
<input type="hidden" name="kh" value="1"> <!--HTTPS on/off -->
|
||||
<input type="hidden" name="kl" value="wt-wt"> <!--region wt-wt = no region/worldwide -->
|
||||
<input type="hidden" name="kg" value="p"> <!--get [g] vs post [p] -->
|
||||
<input type="hidden" name="k7" value="w"> <!-- background colour -->
|
||||
<input type="hidden" name="kj" value="#212a30"> <!-- results page header colour -->
|
||||
<input type="hidden" name="kx" value="#59acd4"> <!-- URLs colour -->
|
||||
<input type="hidden" name="k1" value="-1"> <!-- adverts on/off -->
|
||||
<input type="hidden" name="k9" value="#59acd4"> <!-- links colour -->
|
||||
<input type="hidden" name="kaa" value="#2d586c"> <!-- visited links colour -->
|
||||
<input type="hidden" name="kae" value="#cc0000"> <!-- theme [changes result titles] colour -->
|
||||
<input type="hidden" name="ka" value="junge"> <!-- link font -->
|
||||
<input type="hidden" name="kt" value="junge"> <!-- text font -->
|
||||
</form>
|
||||
<h1 class="title"><a href="/"><img class="img-responsive" src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
|
||||
|
||||
{% tree %}
|
||||
<form id="custom-search-form" class="navbar-form" method="post" action="https://duckduckgo.com">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" placeholder="Search …" name="q">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-default" type="button" onclick="window.location.href='/ardourmanual.html'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="sites" value="manual.ardour.org"><!-- domain -->
|
||||
<input type="hidden" name="kh" value="1"> <!--HTTPS on/off -->
|
||||
<input type="hidden" name="kl" value="wt-wt"> <!--region wt-wt = no region/worldwide -->
|
||||
<input type="hidden" name="kg" value="p"> <!--get [g] vs post [p] -->
|
||||
<input type="hidden" name="k7" value="w"> <!-- background colour -->
|
||||
<input type="hidden" name="kj" value="#212a30"> <!-- results page header colour -->
|
||||
<input type="hidden" name="kx" value="#59acd4"> <!-- URLs colour -->
|
||||
<input type="hidden" name="k1" value="-1"> <!-- adverts on/off -->
|
||||
<input type="hidden" name="k9" value="#59acd4"> <!-- links colour -->
|
||||
<input type="hidden" name="kaa" value="#2d586c"> <!-- visited links colour -->
|
||||
<input type="hidden" name="kae" value="#cc0000"> <!-- theme [changes result titles] colour -->
|
||||
<input type="hidden" name="ka" value="junge"> <!-- link font -->
|
||||
<input type="hidden" name="kt" value="junge"> <!-- text font -->
|
||||
</form>
|
||||
|
||||
{% tree %}
|
||||
|
||||
</div> <!-- tree-inner -->
|
||||
</div> <!-- tree -->
|
||||
|
||||
<div class="span12" id="content">
|
||||
|
|
|
|||
|
|
@ -33,9 +33,6 @@ ul.inside li, ol.inside li {
|
|||
bottom: 0;
|
||||
left: 0;
|
||||
width: 20em;
|
||||
}
|
||||
|
||||
#tree-inner {
|
||||
padding: 1em 1em 2em 1.5em;
|
||||
}
|
||||
|
||||
|
|
@ -45,10 +42,6 @@ ul.inside li, ol.inside li {
|
|||
font-weight: normal;
|
||||
}
|
||||
|
||||
#tree dl {
|
||||
margin-left: 1em;
|
||||
}
|
||||
|
||||
#tree ul {
|
||||
padding-left: 1em;
|
||||
list-style-type: none;
|
||||
|
|
@ -58,26 +51,6 @@ ul.inside li, ol.inside li {
|
|||
border-bottom: none;
|
||||
}
|
||||
|
||||
#tree dd.other {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#tree .level-1,
|
||||
#tree .parent,
|
||||
#tree .child,
|
||||
#tree .parent *,
|
||||
#tree .child * {
|
||||
display: inherit;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
#tree dd.child-1,
|
||||
#tree .child-2,
|
||||
#tree .child-3,
|
||||
#tree .child-4 {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#tree a {
|
||||
display: inline !important;
|
||||
font-size: 0.88em;
|
||||
|
|
@ -102,6 +75,7 @@ ul.inside li, ol.inside li {
|
|||
#content {
|
||||
padding: 1em 2em 2ex 21em;
|
||||
margin-left: 0;
|
||||
line-height: 2em;
|
||||
}
|
||||
|
||||
#content-main {
|
||||
|
|
@ -109,16 +83,6 @@ ul.inside li, ol.inside li {
|
|||
padding-left: .5em;
|
||||
}
|
||||
|
||||
|
||||
#content p,
|
||||
#content li,
|
||||
#content dt,
|
||||
#content dd,
|
||||
#content td,
|
||||
#content th{
|
||||
line-height: 2em;
|
||||
}
|
||||
|
||||
#content h1,
|
||||
#content h2,
|
||||
#content h3,
|
||||
|
|
@ -159,14 +123,12 @@ ul.inside li, ol.inside li {
|
|||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
#content table,
|
||||
#content table.dl {
|
||||
#content table {
|
||||
width:100%;
|
||||
margin: 1em 0;
|
||||
padding: 0;
|
||||
font-weight: normal;
|
||||
text-align: left;
|
||||
line-height: 2ex;
|
||||
}
|
||||
|
||||
#content table tr {
|
||||
|
|
@ -225,54 +187,6 @@ ul.inside li, ol.inside li {
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
#content dl
|
||||
{
|
||||
float:none;
|
||||
clear:both;
|
||||
width:100%;
|
||||
margin: 1em 0;
|
||||
padding: 0;
|
||||
display:inline-block;
|
||||
}
|
||||
|
||||
#content dl:after {
|
||||
content:' ';
|
||||
display:block;
|
||||
clear:both;
|
||||
}
|
||||
|
||||
#content dt,
|
||||
#content dd {
|
||||
border-top: 2px solid #eee;
|
||||
float: left;
|
||||
margin: 0;
|
||||
padding: .5em;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
#content dt {
|
||||
clear: left;
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
#content dd {
|
||||
width: 65%;
|
||||
}
|
||||
|
||||
#content dt.sub1 {
|
||||
padding-left: 2em;
|
||||
}
|
||||
|
||||
#content dt.sub2 {
|
||||
padding-left: 4em;
|
||||
}
|
||||
|
||||
#content dt:first-child,
|
||||
#content dd:nth-child(2) {
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
|
||||
#content figure {
|
||||
display: table;
|
||||
}
|
||||
|
|
@ -312,20 +226,6 @@ ul.inside li, ol.inside li {
|
|||
clear: both;
|
||||
}
|
||||
|
||||
.multicol2 {
|
||||
width: 48%;
|
||||
float:left;
|
||||
padding:0 0 0 2%;
|
||||
margin:0;
|
||||
}
|
||||
|
||||
.multicol3 {
|
||||
width: 31%;
|
||||
float:left;
|
||||
padding:0 0 0 2%;
|
||||
margin:0;
|
||||
}
|
||||
|
||||
kbd {
|
||||
display: inline-block;
|
||||
min-width: 1em;
|
||||
|
|
|
|||
Loading…
Reference in New Issue