aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/Header.jsx
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-04-30 15:23:20 +0200
committerGitHub <noreply@github.com>2017-04-30 15:23:20 +0200
commitfccc9bc45ef55e3e7f14ee4a51f376c53b418991 (patch)
treea29c33256f8361d5e332ad874afede02e8b0b061 /web/src/js/components/Header.jsx
parent29ce5a83d2b4cec067731c2f2f77e1cda134c866 (diff)
parent97a00728a85a32ca6a8e98a991f6dcf28809e73b (diff)
downloadmitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.tar.gz
mitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.tar.bz2
mitmproxy-fccc9bc45ef55e3e7f14ee4a51f376c53b418991.zip
Merge pull request #2271 from mhils/mitmweb-connection-indicator
[web] add connection indicator [WIP]
Diffstat (limited to 'web/src/js/components/Header.jsx')
-rw-r--r--web/src/js/components/Header.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/web/src/js/components/Header.jsx b/web/src/js/components/Header.jsx
index f362e4a1..ebe7453c 100644
--- a/web/src/js/components/Header.jsx
+++ b/web/src/js/components/Header.jsx
@@ -7,6 +7,7 @@ import OptionMenu from './Header/OptionMenu'
import FileMenu from './Header/FileMenu'
import FlowMenu from './Header/FlowMenu'
import {setActiveMenu} from '../ducks/ui/header'
+import ConnectionIndicator from "./Header/ConnectionIndicator"
class Header extends Component {
static entries = [MainMenu, OptionMenu]
@@ -39,10 +40,11 @@ class Header extends Component {
{Entry.title}
</a>
))}
+ <ConnectionIndicator/>
</nav>
- <menu>
+ <div>
<Active/>
- </menu>
+ </div>
</header>
)
}