docs: first-pass conversion to bootstrap3

Crappy default styling for now.
This commit is contained in:
Aldo Cortesi 2015-05-20 13:12:41 +12:00
parent a9f6d53562
commit 6685c27697
6 changed files with 87 additions and 55 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,23 @@
body {
padding-top: 60px;
padding-bottom: 40px; /* Sidebar navigation */
.nav-sidebar {
margin-right: -21px; /* 20px padding + 1px border */
margin-bottom: 20px;
margin-left: -20px;
} }
.nav-sidebar > li > a {
padding-right: 20px;
padding-left: 20px;
}
.nav-sidebar > .active > a,
.nav-sidebar > .active > a:hover,
.nav-sidebar > .active > a:focus {
color: #fff;
background-color: #428bca;
}
.tablenum { .tablenum {
font-weight: bold; font-weight: bold;

View File

@ -1,33 +1,38 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="nav navbar-default navbar-static-top">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<button type="button"
class="navbar-toggle collapsed"
data-toggle="collapse"
data-target="#bs-example-navbar-collapse-1"
>
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="brand" href="@!urlTo(idxpath)!@">mitmproxy $!VERSION!$ docs</a> <a class="navbar-brand" href="@!urlTo(idxpath)!@">mitmproxy $!VERSION!$ docs</a>
</div><!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span3"> <div class="col-md-3">
<div class="well sidebar-nav">
$!navbar!$ $!navbar!$
</div> </div>
</div> <div class="col-md-9">
<div class="span9">
<div class="page-header"> <div class="page-header">
<h1>@!this.title!@</h1> <h1>@!this.title!@</h1>
</div> </div>
$!body!$ $!body!$
</div> </div>
</div> </div>
</div>
<div class="container">
<hr> <hr>
<footer> <footer>

View File

@ -1,4 +1,4 @@
<ul class="nav nav-list"> <ul class="nav nav-sidebar">
$!nav(idxpath, this, state)!$ $!nav(idxpath, this, state)!$
$!nav("install.html", this, state)!$ $!nav("install.html", this, state)!$
$!nav("certinstall.html", this, state)!$ $!nav("certinstall.html", this, state)!$

View File

@ -1,42 +1,56 @@
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-default navbar-static-top">
<div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<button type="button"
class="navbar-toggle collapsed"
data-toggle="collapse"
data-target="#bs-example-navbar-collapse-1"
>
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="brand" href="@!urlTo(idxpath)!@">mitmproxy</a> <a class="navbar-brand" href="@!urlTo("/index.html")!@">mitmproxy</a>
<div class="nav"> </div>
<ul class="nav">
<li $!'class="active"' if this.match("/index.html", True) else ""!$> <a href="@!top!@/index.html">home</a> </li> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li $!'class="active"' if this.under("/index.html") else ""!$> <a href="@!top!@/index.html">home</a> </li>
<li $!'class="active"' if this.under("/doc") else ""!$><a href="@!top!@/doc/index.html">docs</a></li> <li $!'class="active"' if this.under("/doc") else ""!$><a href="@!top!@/doc/index.html">docs</a></li>
<li $!'class="active"' if this.under("/about.html") else ""!$><a href="@!top!@/about.html">about</a></li> <li $!'class="active"' if this.under("/about.html") else ""!$><a href="@!top!@/about.html">about</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-3">
<div class="span3">
<div class="well sidebar-nav">
$!navbar!$ $!navbar!$
</div> </div>
</div> <div class="col-md-9">
<div class="span9">
<div class="page-header"> <div class="page-header">
<h1>@!this.title!@</h1> <h1>@!this.title!@</h1>
</div> </div>
$!body!$ $!body!$
</div> </div>
</div> </div>
</div>
<hr> <div class="container">
<footer> <footer>
<p>@!copyright!@</p> <hr>
<p>Copyright 2014 Aldo Cortesi</p>
</footer> </footer>
</div> </div>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-4150636-13']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>

View File

@ -83,7 +83,8 @@ setup(
"coveralls>=0.4.1", "coveralls>=0.4.1",
"pathod>=%s, <%s" % ( "pathod>=%s, <%s" % (
version.MINORVERSION, version.NEXT_MINORVERSION version.MINORVERSION, version.NEXT_MINORVERSION
) ),
"countershape"
], ],
'contentviews': [ 'contentviews': [
"pyamf>=0.6.1", "pyamf>=0.6.1",