Merge branch 'develop' into vue3

This commit is contained in:
syuilo
2020-08-19 22:15:04 +09:00
119 changed files with 3454 additions and 640 deletions

View File

@@ -8,7 +8,7 @@
/>
</portal>
<div class="controller _card" v-if="objectSelected">
<div class="controller _card _vMargin" v-if="objectSelected">
<div class="_content">
<p class="name">{{ selectedFurnitureName }}</p>
<x-preview ref="preview"/>
@@ -34,7 +34,7 @@
</div>
</div>
<div class="menu _card" v-if="isMyRoom">
<div class="menu _card _vMargin" v-if="isMyRoom">
<div class="_content">
<mk-button @click="add()"><fa :icon="faBoxOpen"/> {{ $t('_rooms.addFurniture') }}</mk-button>
</div>