From c34cf1176914d8523795f46e49b530333b7cbb40 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 30 Apr 2017 11:49:21 -0400 Subject: [PATCH] MjpegServer: style fixes for root page (#72) - Moves stream to the right of any settings - When the page is too small, then the stream will move to the top of the settings --- src/MjpegServerImpl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/MjpegServerImpl.cpp b/src/MjpegServerImpl.cpp index d4d77dfb7d..2b3c31b08f 100644 --- a/src/MjpegServerImpl.cpp +++ b/src/MjpegServerImpl.cpp @@ -60,11 +60,16 @@ static const char* startRootPage = "\n" " border: 1px solid black;\n" " border-collapse: collapse;\n" "}\n" + ".settings { float: left; }\n" + ".stream { display: inline-block; margin-left: 10px; }\n" "\n" "CameraServer\n" + "
\n" "

\n" - "Settings JSON\n"; -static const char* endRootPage =""; + "Settings JSON\n" + "

\n" + "
\n"; +static const char* endRootPage ="
"; class MjpegServerImpl::ConnThread : public wpi::SafeThread { public: