diff options
author | Devaev Maxim <[email protected]> | 2018-11-24 07:49:35 +0300 |
---|---|---|
committer | Devaev Maxim <[email protected]> | 2018-11-24 07:49:35 +0300 |
commit | f8bd0eca6a92618fc38d6db5c26114111d2df37f (patch) | |
tree | 1036bf0d33bcc7dcaad549590b882d51dc8b215f | |
parent | 26863d5bfd1868c84c4bb299dc7c2734d5f2001f (diff) |
kvm: link to index
-rw-r--r-- | web/css/menu.css | 48 | ||||
-rw-r--r-- | web/js/ui.js | 5 | ||||
-rw-r--r-- | web/kvm/index.html | 9 | ||||
-rw-r--r-- | web/svg/logo.svg | 17 |
4 files changed, 51 insertions, 28 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; +ul#menu li.menu-right-items { + float: right; +} + +ul#menu li.menu-left-items { float: left; } -ul.menu li.menu-right-items { - float: right; +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 { +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 @@ </div> </div> - <ul id="menu" class="menu"> - <li class="menu-logo"> - <img class="svg-gray" src="../svg/logo.svg" alt="π-kvm" /> + <ul id="menu"> + <li class="menu-left-items"> + <a id="menu-logo" href="#"> + ↩ + <img class="svg-gray" src="../svg/logo.svg" alt="π-kvm" /> + </a> </li> <li class="menu-right-items"> diff --git a/web/svg/logo.svg b/web/svg/logo.svg index 548ede08..eec39fd3 100644 --- a/web/svg/logo.svg +++ b/web/svg/logo.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16.933332mm" - height="4.3488798mm" - viewBox="0 0 16.933332 4.3488798" + width="64" + height="18" + viewBox="0 0 16.933333 4.7625002" version="1.1" id="svg8" inkscape:version="0.92.2 2405546, 2018-03-11" @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="23.887322" - inkscape:cy="-8.8986029" + inkscape:cx="13.879867" + inkscape:cy="2.1728257" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -39,7 +39,8 @@ inkscape:window-height="1020" inkscape:window-x="0" inkscape:window-y="30" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + units="px" /> <metadata id="metadata5"> <rdf:RDF> @@ -56,10 +57,10 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-11.627273,-5.9349994)"> + transform="translate(-11.627273,-5.521379)"> <g aria-label="π-kvm" - transform="matrix(0.44662735,0,0,0.44662735,-8.0000339,-7.0757243)" + transform="matrix(0.44662735,0,0,0.44662735,-8.0000339,-7.4893447)" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10px;line-height:125%;font-family:'Adobe Garamond Pro';-inkscape-font-specification:'Adobe Garamond Pro Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.59240288px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="flowRoot4747"> <path |