diff options
author | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
---|---|---|
committer | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
commit | c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f (patch) | |
tree | 1e62785d669d86f6e551a99b9debfe445389bd48 /doc-src/_layout.html | |
parent | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (diff) | |
parent | 5c33f6784b4ba34dd9825ea7e3070cdf0b2b4621 (diff) | |
download | mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.gz mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.bz2 mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc-src/_layout.html')
-rw-r--r-- | doc-src/_layout.html | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doc-src/_layout.html b/doc-src/_layout.html index d9ff6be1..71b15fd2 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -1,6 +1,6 @@ -<div class="navbar"> +<div class="navbar navbar-fixed-top"> <div class="navbar-inner"> - <div class="container-fluid"> + <div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -12,15 +12,14 @@ </div> </div> -<div class="container-fluid"> - <div class="row-fluid"> +<div class="container"> + <div class="row"> <div class="span3"> <div class="well sidebar-nav"> <ul class="nav nav-list"> $!nav("index.html", this, state)!$ $!nav("install.html", this, state)!$ $!nav("howmitmproxy.html", this, state)!$ - $!nav("faq.html", this, state)!$ <li class="nav-header">Tools</li> $!nav("mitmproxy.html", this, state)!$ @@ -38,12 +37,13 @@ $!nav("reverseproxy.html", this, state)!$ $!nav("upstreamcerts.html", this, state)!$ - <li class="nav-header">SSL interception</li> + <li class="nav-header">Installing Certificates</li> $!nav("ssl.html", this, state)!$ $!nav("certinstall/firefox.html", this, state)!$ $!nav("certinstall/osx.html", this, state)!$ $!nav("certinstall/windows7.html", this, state)!$ $!nav("certinstall/ios.html", this, state)!$ + $!nav("certinstall/ios-simulator.html", this, state)!$ $!nav("certinstall/android.html", this, state)!$ <li class="nav-header">Transparent Proxying</li> @@ -68,13 +68,11 @@ </div> $!body!$ </div> - - </div><!--/row--> + </div> <hr> <footer> <p>@!copyright!@</p> </footer> - -</div><!--/.fluid-container--> +</div> |