diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
| commit | c82d27b2a215c075dba71254cafdc86e98e0f2d9 (patch) | |
| tree | 84324135951cf67617e4887923bee0627c1d1085 /web/src/css | |
| parent | 6ad2f13341208b8460eae0dd0105c3109e773bae (diff) | |
| parent | 9c6199db9be34fad18eaedb86463333671ae190a (diff) | |
| download | mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.gz mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.bz2 mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.zip | |
Merge branch 'master' into settings
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
Diffstat (limited to 'web/src/css')
| -rw-r--r-- | web/src/css/eventlog.less | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/src/css/eventlog.less b/web/src/css/eventlog.less index 908312cd..393f75db 100644 --- a/web/src/css/eventlog.less +++ b/web/src/css/eventlog.less @@ -10,6 +10,8 @@ background-color: #F2F2F2; padding: 0 5px; flex: 0 0 auto; + border-top: 1px solid #aaa; + cursor: row-resize; } > pre { @@ -48,4 +50,4 @@ margin-top: -2px; margin-left: 3px; } -}
\ No newline at end of file +} |