merging
This commit is contained in:
commit
fcac59a7a0
3 changed files with 10 additions and 4 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div id="app" v-if="(windowReady && sessionReady)">
|
||||
|
||||
<button class="titlebar" />
|
||||
<button id="titlebar" />
|
||||
|
||||
<!-- Minimize and exit buttons. -->
|
||||
<span class="menu">
|
||||
|
|
@ -138,7 +138,7 @@ html, body {
|
|||
border-radius: 15px;
|
||||
}
|
||||
|
||||
.titlebar {
|
||||
#titlebar {
|
||||
position: fixed;
|
||||
|
||||
width: 100vw;
|
||||
|
|
@ -148,7 +148,6 @@ html, body {
|
|||
|
||||
background-color: #EBEBEB;
|
||||
|
||||
-webkit-user-select: none;
|
||||
-webkit-app-region: drag;
|
||||
|
||||
border: none;
|
||||
|
|
|
|||
|
|
@ -97,6 +97,9 @@ export default defineComponent({
|
|||
|
||||
z-index: 3;
|
||||
|
||||
// To prevent window drag when overlapping with titlebar.
|
||||
-webkit-app-region: no-drag;
|
||||
|
||||
// border: 4px solid #C6C6C6;
|
||||
border-radius: 50%;
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
{"w":629,"h":500,"x":1423,"y":657}
|
||||
<<<<<<< HEAD
|
||||
{"w":629,"h":500,"x":1423,"y":657}
|
||||
=======
|
||||
{"w":622,"h":616,"x":1163,"y":499}
|
||||
>>>>>>> logout
|
||||
|
|
|
|||
Loading…
Reference in a new issue