diff options
| author | Devaev Maxim <[email protected]> | 2020-08-16 10:35:29 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2020-08-16 10:35:29 +0300 |
| commit | 8c400299562d4101a9a953b85f7e01744f14d005 (patch) | |
| tree | 551772cc291fec2cad18666f24fe893f475d4474 /web/kvm | |
| parent | 2f069dbf91862d2003782ea26e158ba2c4a42d3a (diff) | |
Fixed pikvm/pikvm#38: Closeable stream window
Diffstat (limited to 'web/kvm')
| -rw-r--r-- | web/kvm/index.html | 3 | ||||
| -rw-r--r-- | web/kvm/window-about.pug | 2 | ||||
| -rw-r--r-- | web/kvm/window-keyboard.pug | 2 | ||||
| -rw-r--r-- | web/kvm/window-stream.pug | 2 | ||||
| -rw-r--r-- | web/kvm/windows.pug | 7 |
5 files changed, 8 insertions, 8 deletions
diff --git a/web/kvm/index.html b/web/kvm/index.html index be39a464..53c985ac 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -402,8 +402,9 @@ </li> </ul> <div class="window" id="stream-window"> - <div class="window-header" id="stream-window-header" style="z-index:1"> + <div class="window-header" id="stream-window-header"> <div class="window-grab">Stream</div> + <button class="window-button-close">×</button> </div> <div id="stream-info"></div> <div class="stream-box-inactive" id="stream-box"><img class="stream-image-inactive" id="stream-image" src="/share/png/blank-stream.png"></div> diff --git a/web/kvm/window-about.pug b/web/kvm/window-about.pug index 6304096e..b22d5a96 100644 --- a/web/kvm/window-about.pug +++ b/web/kvm/window-about.pug @@ -9,7 +9,7 @@ mixin about_tab(name, title, checked=false) else span(class="code-comment") No data -+window("about-window", "About", true, false) ++window("about-window", "About", false) div(id="about") table tr diff --git a/web/kvm/window-keyboard.pug b/web/kvm/window-keyboard.pug index 49d89767..467142df 100644 --- a/web/kvm/window-keyboard.pug +++ b/web/kvm/window-keyboard.pug @@ -15,7 +15,7 @@ mixin empty_key(width=0) mixin lamp(cls) img(class=`inline-lamp ${cls} led-gray` src=`${svg_dir}/led-square.svg`) -+window("keyboard-window", "Virtual Keyboard", true, true) ++window("keyboard-window", "Virtual Keyboard", true) div(id="keyboard-desktop" class="keypad" align="center") div(class="keypad-block") div(class="keypad-row") diff --git a/web/kvm/window-stream.pug b/web/kvm/window-stream.pug index a86c1812..232a3f72 100644 --- a/web/kvm/window-stream.pug +++ b/web/kvm/window-stream.pug @@ -1,4 +1,4 @@ -+window("stream-window", "Stream", false, true) ++window("stream-window", "Stream", true) div(id="stream-info") div(id="stream-box" class="stream-box-inactive") img(id="stream-image" class="stream-image-inactive" src=`${png_dir}/blank-stream.png`) diff --git a/web/kvm/windows.pug b/web/kvm/windows.pug index 21e17e0a..15fdf131 100644 --- a/web/kvm/windows.pug +++ b/web/kvm/windows.pug @@ -1,9 +1,8 @@ -mixin window(id, title, closeable=true, with_header_id=false) +mixin window(id, title, with_header_id=false) div(id=id class="window") - div(id=(with_header_id ? `${id}-header` : "") class="window-header" style=(closeable ? "" : "z-index:1")) + div(id=(with_header_id ? `${id}-header` : "") class="window-header") div(class="window-grab") #{title} - if closeable - button(class="window-button-close") × + button(class="window-button-close") × block include window-stream.pug |