summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-09 21:41:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-09 21:41:20 +0900
commit6678d97cc46cd91caa9598a451999caee27792a7 (patch)
treeae0eb8890be84f18290a437580835c6e43610df2 /src/client
parent:art: (diff)
downloadsharkey-6678d97cc46cd91caa9598a451999caee27792a7.tar.gz
sharkey-6678d97cc46cd91caa9598a451999caee27792a7.tar.bz2
sharkey-6678d97cc46cd91caa9598a451999caee27792a7.zip
:art:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/components/modal-page-window.vue2
-rw-r--r--src/client/components/ui/modal-window.vue2
-rw-r--r--src/client/components/ui/window.vue2
-rw-r--r--src/client/style.scss6
4 files changed, 9 insertions, 3 deletions
diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue
index ddf8ac446e..e7d96f7a6f 100644
--- a/src/client/components/modal-page-window.vue
+++ b/src/client/components/modal-page-window.vue
@@ -1,6 +1,6 @@
<template>
<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
- <div class="hrmcaedk _popup _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
+ <div class="hrmcaedk _window _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
<div class="header" @contextmenu="onContextmenu">
<span class="title">
<XHeader :info="pageInfo" :back-button="history.length > 0" @back="back()" :close-button="true" @close="$refs.modal.close()"/>
diff --git a/src/client/components/ui/modal-window.vue b/src/client/components/ui/modal-window.vue
index 2d2b587662..da98192b87 100644
--- a/src/client/components/ui/modal-window.vue
+++ b/src/client/components/ui/modal-window.vue
@@ -1,6 +1,6 @@
<template>
<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
- <div class="ebkgoccj _popup _narrow_" @keydown="onKeydown" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }">
+ <div class="ebkgoccj _window _narrow_" @keydown="onKeydown" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }">
<div class="header">
<button class="_button" v-if="withOkButton" @click="$emit('close')"><i class="fas fa-times"></i></button>
<span class="title">
diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue
index 4fabab3d6d..773c3b9b13 100644
--- a/src/client/components/ui/window.vue
+++ b/src/client/components/ui/window.vue
@@ -1,7 +1,7 @@
<template>
<transition :name="$store.state.animation ? 'window' : ''" appear @after-leave="$emit('closed')">
<div class="ebkgocck" :class="{ front }" v-if="showing">
- <div class="body _popup _shadow _narrow_" @mousedown="onBodyMousedown" @keydown="onKeydown">
+ <div class="body _window _shadow _narrow_" @mousedown="onBodyMousedown" @keydown="onKeydown">
<div class="header" :class="{ mini }" @contextmenu.prevent.stop="onContextmenu">
<button v-if="closeButton" class="_button" @click="close()"><i class="fas fa-times"></i></button>
diff --git a/src/client/style.scss b/src/client/style.scss
index 874928942f..1253141d36 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -318,6 +318,12 @@ hr {
}
}
+._window {
+ background: var(--panel);
+ border-radius: var(--radius);
+ contain: content;
+}
+
._popup {
background: var(--popup);
border-radius: var(--radius);