Merge branch 'master' into 0.10

1 files changed, 43 insertions, 0 deletions

diff --git a/libmproxy/static/mitmproxy.css b/libmproxy/static/mitmproxy.css
new file mode 100644
index 00000000..09bcb5f7
--- /dev/null
+++ b/libmproxy/static/mitmproxy.css
@@ -0,0 +1,43 @@
+
+
+.fronttable {
+}
+
+.bigtitle {
+    font-weight: bold;
+    font-size: 50px;
+    line-height: 55px;
+    text-align: center;
+    display: table;
+    height: 300px;
+}
+
+.bigtitle>div {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+section {
+    margin-top: 50px;
+}
+
+.example {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.innerlink {
+    text-decoration: none;
+    border-bottom:1px dotted;
+    margin-bottom: 15px;
+}
+
+.masthead {
+    padding: 50px 0 60px;
+    text-align: center;
+
+}
+
+.header {
+    font-size: 1.5em;
+}