graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 23:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎨

Browse source
This commit is contained in:
syuilo 2019-02-26 05:22:21 +09:00
parent 42525bb12a
commit bf2bdaa6ff
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
4 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/app/common/views/deck/deck.column.vue
View file

@ -1,5 +1,6 @@
<template> <template>
<div class="dnpfarvgbnfmyzbdquhhzyxcmstpdqzs" :class="{ naked, narrow, active, isStacked, draghover, dragging, dropready }" <div class="dnpfarvgbnfmyzbdquhhzyxcmstpdqzs" :class="{ naked, narrow, active, isStacked, draghover, dragging, dropready }"
:data-mobile="$root.isMobile"
@dragover.prevent.stop="onDragover" @dragover.prevent.stop="onDragover"
@dragleave="onDragleave" @dragleave="onDragleave"
@drop.prevent.stop="onDrop" @drop.prevent.stop="onDrop"
@ -113,7 +114,7 @@ export default Vue.extend({
column: this, column: this,
isScrollTop: this.isScrollTop, isScrollTop: this.isScrollTop,
count: v => this.count = v, count: v => this.count = v,
inDeck: !this.naked inNakedDeckColumn: !this.naked
}; };
}, },
@ -326,6 +327,13 @@ export default Vue.extend({
box-shadow var(--shadow) box-shadow var(--shadow)
overflow hidden overflow hidden
&[data-mobile]
border-radius 0
box-shadow none
> header
box-shadow none
&.draghover &.draghover
box-shadow 0 0 0 2px var(--primaryAlpha08) box-shadow 0 0 0 2px var(--primaryAlpha08)

13
src/client/app/common/views/deck/deck.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<mk-ui :class="$style.root"> <mk-ui :class="$style.root">
<div class="qlvquzbjribqcaozciifydkngcwtyzje" ref="body" :style="style" :class="`${$store.state.device.deckColumnAlign} ${$store.state.device.deckColumnWidth}`" v-hotkey.global="keymap"> <div class="qlvquzbjribqcaozciifydkngcwtyzje" :data-mobile="$root.isMobile" ref="body" :style="style" :class="`${$store.state.device.deckColumnAlign} ${$store.state.device.deckColumnWidth}`" v-hotkey.global="keymap">
<template v-for="ids in layout"> <template v-for="ids in layout">
<div v-if="ids.length > 1" class="folder"> <div v-if="ids.length > 1" class="folder">
<template v-for="id, i in ids"> <template v-for="id, i in ids">
@ -68,6 +68,7 @@ export default Vue.extend({
provide() { provide() {
return { return {
inDeck: true,
getColumnVm: this.getColumnVm, getColumnVm: this.getColumnVm,
narrow: true narrow: true
}; };
@ -331,6 +332,16 @@ export default Vue.extend({
overflow-y hidden overflow-y hidden
-webkit-overflow-scrolling touch -webkit-overflow-scrolling touch
&[data-mobile]
padding 0
> div
margin-right 0
&.folder
> *:not(:last-child)
margin-bottom 0
> div > div
margin-right 8px margin-right 8px
width 330px width 330px

8
src/client/app/desktop/views/components/ui-container.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="kedshtep" :class="{ naked, inDeck }"> <div class="kedshtep" :class="{ naked, inNakedDeckColumn }">
<header v-if="showHeader"> <header v-if="showHeader">
<div class="title"><slot name="header"></slot></div> <div class="title"><slot name="header"></slot></div>
<slot name="func"></slot> <slot name="func"></slot>
@ -36,7 +36,7 @@ export default Vue.extend({
}, },
}, },
inject: { inject: {
inDeck: { inNakedDeckColumn: {
default: false default: false
} }
}, },
@ -58,7 +58,7 @@ export default Vue.extend({
.kedshtep .kedshtep
overflow hidden overflow hidden
&:not(.inDeck) &:not(.inNakedDeckColumn)
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -106,7 +106,7 @@ export default Vue.extend({
&:active &:active
color var(--faceTextButtonActive) color var(--faceTextButtonActive)
&.inDeck &.inNakedDeckColumn
background var(--face) background var(--face)
> header > header

12
src/client/app/mobile/views/components/ui-container.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="ukygtjoj" :class="{ naked, inDeck, hideHeader: !showHeader }"> <div class="ukygtjoj" :class="{ naked, inDeck, inNakedDeckColumn, hideHeader: !showHeader }">
<header v-if="showHeader"> <header v-if="showHeader">
<div class="title"><slot name="header"></slot></div> <div class="title"><slot name="header"></slot></div>
<slot name="func"></slot> <slot name="func"></slot>
@ -38,6 +38,9 @@ export default Vue.extend({
inject: { inject: {
inDeck: { inDeck: {
default: false default: false
},
inNakedDeckColumn: {
default: false
} }
}, },
data() { data() {
@ -57,7 +60,10 @@ export default Vue.extend({
.ukygtjoj .ukygtjoj
overflow hidden overflow hidden
&:not(.inDeck) &.inDeck
box-shadow none !important
&:not(.inNakedDeckColumn)
background var(--face) background var(--face)
border-radius 8px border-radius 8px
box-shadow 0 4px 16px rgba(#000, 0.1) box-shadow 0 4px 16px rgba(#000, 0.1)
@ -102,7 +108,7 @@ export default Vue.extend({
> div > div
color var(--text) color var(--text)
&.inDeck &.inNakedDeckColumn
background var(--face) background var(--face)
> header > header