mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-30 11:03:08 +02:00
UI tweaks
This commit is contained in:
parent
b177b0cafc
commit
067588845b
4 changed files with 25 additions and 3 deletions
|
@ -123,7 +123,7 @@ export default defineComponent({
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background: var(--buttonBg);
|
background: var(--buttonBg);
|
||||||
border-radius: 8px;
|
border-radius: 999px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
&:not(:disabled):hover {
|
||||||
|
|
|
@ -232,6 +232,9 @@ export default defineComponent({
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
|
// 影の都合上
|
||||||
|
position: relative;
|
||||||
|
|
||||||
> .right {
|
> .right {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<router-view v-slot="{ Component }">
|
<router-view v-slot="{ Component }">
|
||||||
<transition>
|
<transition>
|
||||||
<keep-alive :include="['timeline']">
|
<keep-alive :include="['timeline']">
|
||||||
<component :is="Component" :ref="changePage"/>
|
<component :is="Component" :ref="changePage" @contextmenu.stop="onContextmenu"/>
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
</transition>
|
</transition>
|
||||||
</router-view>
|
</router-view>
|
||||||
|
@ -16,10 +16,12 @@
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
|
import { faWindowMaximize } from '@fortawesome/free-solid-svg-icons';
|
||||||
import XColumn from './column.vue';
|
import XColumn from './column.vue';
|
||||||
import XNotes from '@/components/notes.vue';
|
import XNotes from '@/components/notes.vue';
|
||||||
import XHeader from '@/ui/_common_/header.vue';
|
import XHeader from '@/ui/_common_/header.vue';
|
||||||
import { deckStore } from '@/ui/deck/deck-store';
|
import { deckStore } from '@/ui/deck/deck-store';
|
||||||
|
import * as os from '@/os';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
components: {
|
components: {
|
||||||
|
@ -54,6 +56,21 @@ export default defineComponent({
|
||||||
this.pageInfo = page.INFO;
|
this.pageInfo = page.INFO;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onContextmenu(e) {
|
||||||
|
if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
|
||||||
|
const path = this.$route.path;
|
||||||
|
os.contextMenu([{
|
||||||
|
type: 'label',
|
||||||
|
text: path,
|
||||||
|
}, {
|
||||||
|
icon: faWindowMaximize,
|
||||||
|
text: this.$ts.openInWindow,
|
||||||
|
action: () => {
|
||||||
|
os.pageWindow(path);
|
||||||
|
}
|
||||||
|
}], e);
|
||||||
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -114,7 +114,9 @@ export default defineComponent({
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.wtdtxvec {
|
.wtdtxvec {
|
||||||
padding-top: 1px; // ウィジェットのbox-shadowを利用した1px borderを隠さないようにするため
|
._panel {
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
> header {
|
> header {
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
|
|
Loading…
Reference in a new issue