diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /web/src/css/layout.less | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'web/src/css/layout.less')
| -rw-r--r-- | web/src/css/layout.less | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/web/src/css/layout.less b/web/src/css/layout.less index f6807f24..1075d6c9 100644 --- a/web/src/css/layout.less +++ b/web/src/css/layout.less @@ -8,6 +8,8 @@ html, body, #container { display: flex; flex-direction: column; + outline: none; // our root element is focused by default. + > header, > footer, > .eventlog { flex: 0 0 auto; } @@ -15,12 +17,15 @@ 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; - outline: 0; - &.vertical { flex-direction: column; } |