diff --git a/src/main.cpp b/src/main.cpp index 16acb4a..2db2431 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -109,13 +109,11 @@ public: // картинки, их даже можно кешировать static constexpr const char* FAVICON_ICO = "static/favicon.png"; - static constexpr const char* KROKODIL_GIF = "static/krokodil.gif"; static constexpr const char* VUE_JS = "static/js/vue.js"; // это тоже можно кешировать // а эти стили нельзя кешировать в отладочной версии static constexpr const char* STYLE_CSS = "static/style.css"; static constexpr const char* FIELDS_CSS = "static/fields.css"; - static constexpr const char* KB_MP4 = "static/video_2024-11-06_15-49-35.mp4"; ServerResources(const ServerResources&) = delete; @@ -124,9 +122,7 @@ public: auth.users.emplace_back(std::make_shared("admin", "", http::auth::User::SUPERUSER)); sf->registerFile(FAVICON_ICO, mime_types::image_png, true); - sf->registerFile(KROKODIL_GIF, mime_types::image_gif, true); sf->registerFile(VUE_JS, mime_types::javascript, true); - sf->registerFile(KB_MP4, mime_types::video_mp4, true); sf->registerFile(STYLE_CSS, mime_types::text_css, true); sf->registerFile(FIELDS_CSS, mime_types::text_css, true); @@ -187,11 +183,9 @@ public: })); s.resources.emplace_back(std::make_unique("/favicon.ico", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(FAVICON_ICO, rep); })); - s.resources.emplace_back(std::make_unique("/images/krokodil_vzryvaetsya_hd.gif", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(KROKODIL_GIF, rep); })); s.resources.emplace_back(std::make_unique("/style.css", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(STYLE_CSS, rep); })); s.resources.emplace_back(std::make_unique("/fields.css", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(FIELDS_CSS, rep); })); s.resources.emplace_back(std::make_unique("/js/vue.js", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(VUE_JS, rep); })); - s.resources.emplace_back(std::make_unique("/vid/video_2024-11-06_15-49-35.mp4", [this](const auto& req, auto& rep) { boost::ignore_unused(req); sf->serve(KB_MP4, rep); })); s.resources.emplace_back(std::make_unique("/api/get/statistics", this->auth, http::auth::User::WATCH_STATISTICS, [this](const auto& req, auto& rep) { if (req.method != "GET") { diff --git a/static/fields.css b/static/fields.css index 596461d..e4193b6 100644 --- a/static/fields.css +++ b/static/fields.css @@ -1,5 +1,5 @@ .tabs-header { - margin: 0.5em 0; + margin: 0.5em 0 3px; background: var(--brand-bg); } .tabs-header > * { @@ -17,7 +17,7 @@ } .tabs-btn.active { color: var(--brand-text); - border-bottom: 3px solid var(--brand-text); + border-bottom: 3px solid var(--bg-action); } .tabs-body-item { padding: 20px 0; @@ -58,7 +58,7 @@ } .action-button { - background: var(--brand-bg); + background: var(--bg-action); } .nav-bar-element { @@ -113,7 +113,7 @@ label { .settings-set-container input, .settings-set-container select { margin-top: 0.5em; border: none; - border-bottom: solid 2px var(--text-color); + border-bottom: solid 2px var(--text-color2); width: 20em; box-sizing: border-box; } @@ -121,7 +121,7 @@ label { .settings-set-container input:focus { outline: none; border: none; - border-bottom: solid 2px var(--brand-text); + border-bottom: solid 2px var(--bg-action); } .settings-set-container input:invalid { @@ -193,7 +193,7 @@ details > summary { .toggle-input input[type="checkbox"]:checked + .slider { left: 25px; - background-color: var(--brand-text); + background-color: var(--bg-action); } .toggle-input input[type="checkbox"]:checked + .slider:before { diff --git a/static/krokodil.gif b/static/krokodil.gif deleted file mode 100644 index faa7900..0000000 Binary files a/static/krokodil.gif and /dev/null differ diff --git a/static/login.html b/static/login.html index 8bc2298..4fd1973 100644 --- a/static/login.html +++ b/static/login.html @@ -35,7 +35,7 @@ width: 100%; box-sizing: border-box; border: none; - border-bottom: var(--brand-bg) 2px solid; + border-bottom: var(--text-color2) 2px solid; background-color: var(--bg-color); text-overflow: ellipsis; min-height: 2em; @@ -44,7 +44,7 @@ .form-row input:focus { outline: none; border: none; - border-bottom: var(--brand-text) 2px solid; + border-bottom: var(--bg-action) 2px solid; background-color: var(--bg-selected); } @@ -52,6 +52,7 @@ border: none; font-weight: bolder; background: var(--bg-action); + color: var(--text-color); text-align: center; } diff --git a/static/main.html b/static/main.html index 1829c9f..20deedb 100644 --- a/static/main.html +++ b/static/main.html @@ -116,7 +116,7 @@ - +
Температура ADRV{{ stat_device.adrv }} °C
Температура ZYNQ {{ stat_device.zynq }} °C
Температура ZYNQ{{ stat_device.zynq }} °C
Температура FPGA{{ stat_device.fpga }} °C
@@ -441,8 +441,7 @@