diff options
author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
---|---|---|
committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
tree | a7488b32871c142141a813dc6ff2ede172672c31 /web/src/css/layout.less | |
parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'web/src/css/layout.less')
-rw-r--r-- | web/src/css/layout.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/css/layout.less b/web/src/css/layout.less index f6807f24..5869411c 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,10 @@ html, body, #container { .main-view { flex: 1 1 auto; - + display: flex; flex-direction: row; - outline: 0; - &.vertical { flex-direction: column; } |