From f8bd0eca6a92618fc38d6db5c26114111d2df37f Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sat, 24 Nov 2018 07:49:35 +0300 Subject: [PATCH] kvm: link to index --- web/css/menu.css | 52 +++++++++++++++++++++++++++++----------------- web/js/ui.js | 5 +++++ web/kvm/index.html | 9 +++++--- web/svg/logo.svg | 17 ++++++++------- 4 files changed, 53 insertions(+), 30 deletions(-) diff --git a/web/css/menu.css b/web/css/menu.css index 789f4119..6fa28e44 100644 --- a/web/css/menu.css +++ b/web/css/menu.css @@ -1,4 +1,4 @@ -ul.menu { +ul#menu { box-shadow: var(--shadow-small); list-style-type: none; margin: 0; @@ -11,24 +11,38 @@ ul.menu { z-index: 2147483646; } -ul.menu li.menu-logo { - line-height: 50px; - margin-top: -2px; - margin-left: 16px; - float: left; -} - -ul.menu li.menu-right-items { +ul#menu li.menu-right-items { float: right; } -ul.menu img { +ul#menu li.menu-left-items { + float: left; +} + +ul#menu li a#menu-logo { + line-height: 50px; + outline: none; + cursor: pointer; + border-right: var(--border-menu-thin); + display: inline-block; + color: var(--cs-menu-default-fg); + padding-left: 16px; + padding-right: 16px; + text-decoration: none; +} + +ul#menu img { vertical-align: middle; margin-right: 10px; height: 20px; } -ul.menu li a.menu-item { +ul#menu li a#menu-logo img { + margin-top: -2px; + height: 24px; +} + +ul#menu li a.menu-item { line-height: 50px; outline: none; cursor: pointer; @@ -40,22 +54,22 @@ ul.menu li a.menu-item { text-decoration: none; } -ul.menu li a.menu-item:hover:not(.active) { +ul#menu li a#menu-logo:hover:not(.active), a.menu-item:hover:not(.active) { background-color: var(--cs-menu-hovered-bg); } @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) { /* iPad 8 */ - ul.menu li a.menu-item:hover:not(.active) { + ul#menu li a#menu-item:hover:not(.active), a.menu-item:hover:not(.active) { background-color: var(--cs-menu-default-bg) !important; } } -ul.menu li a.menu-item-selected { +ul#menu li a.menu-item-selected { box-shadow: var(--shadow-menu-pressed); background-color: var(--cs-menu-pressed-bg) !important; } -ul.menu li div.menu-item-content { +ul#menu li div.menu-item-content { visibility: hidden; overflow: hidden; white-space: nowrap; @@ -69,21 +83,21 @@ ul.menu li div.menu-item-content { z-index: 2147483645; } -ul.menu li div.menu-item-content-buttons { +ul#menu li div.menu-item-content-buttons { background-color: var(--cs-control-default-bg); } -ul.menu li div.menu-item-content-text { +ul#menu li div.menu-item-content-text { margin: 10px 15px 10px 15px; font-size: 14px; } -ul.menu li div.menu-item-content button, select { +ul#menu li div.menu-item-content button, select { text-align: left; padding: 0 16px; } -ul.menu li div.menu-item-content hr { +ul#menu li div.menu-item-content hr { margin: 0; display: block; height: 0px; diff --git a/web/js/ui.js b/web/js/ui.js index 2b41e0b1..07de4e85 100644 --- a/web/js/ui.js +++ b/web/js/ui.js @@ -32,6 +32,11 @@ function Ui() { } }); + var el_menu_logo = $("menu-logo"); + if (el_menu_logo) { + el_menu_logo.onclick = () => window.history.back(); + } + window.onmouseup = __globalMouseButtonHandler; window.ontouchend = __globalMouseButtonHandler; diff --git a/web/kvm/index.html b/web/kvm/index.html index 0e84e52f..43d2a997 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -61,9 +61,12 @@ -