aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-06-08 19:01:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-06-08 19:01:32 +0200
commitd389b9c59d7f4a4918a15b5a40d771ccc154d751 (patch)
treed5624c3ee006b1c607cec096086c329290eb8e5a
parent083b404bbac49307b9fab5f2d57a1f3889070786 (diff)
downloadmitmproxy-d389b9c59d7f4a4918a15b5a40d771ccc154d751.tar.gz
mitmproxy-d389b9c59d7f4a4918a15b5a40d771ccc154d751.tar.bz2
mitmproxy-d389b9c59d7f4a4918a15b5a40d771ccc154d751.zip
fix #615
-rw-r--r--libmproxy/web/static/app.css1
-rw-r--r--web/src/css/layout.less5
2 files changed, 6 insertions, 0 deletions
diff --git a/libmproxy/web/static/app.css b/libmproxy/web/static/app.css
index a7dc4f00..8a2a4356 100644
--- a/libmproxy/web/static/app.css
+++ b/libmproxy/web/static/app.css
@@ -59,6 +59,7 @@ body,
}
.main-view {
flex: 1 1 auto;
+ height: 0;
display: flex;
flex-direction: row;
}
diff --git a/web/src/css/layout.less b/web/src/css/layout.less
index 5869411c..1075d6c9 100644
--- a/web/src/css/layout.less
+++ b/web/src/css/layout.less
@@ -18,6 +18,11 @@ html, body, #container {
.main-view {
flex: 1 1 auto;
+ // All children of #container need an explicit height
+ // If we don't set this, the scrollbars disappear
+ // (https://github.com/mitmproxy/mitmproxy/issues/615)
+ height: 0;
+
display: flex;
flex-direction: row;