Resolve merge conflicts
This commit is contained in:
@@ -47,7 +47,7 @@ computed(() => value = getValueStatement())
|
||||
</style>
|
||||
|
||||
<template>
|
||||
<div class="math-statement">
|
||||
<div class="math-statement" style="background: white">
|
||||
<div class="content">
|
||||
<Katex :statement="statement" size="big"/>
|
||||
<div class="result" v-if="value">
|
||||
|
||||
37
src/components/TextBox.vue
Normal file
37
src/components/TextBox.vue
Normal file
@@ -0,0 +1,37 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
|
||||
const props = defineProps({
|
||||
statement: { type: String, required: true },
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Draggable :grid="[25, 25]">
|
||||
<div style="display: flex">
|
||||
<q-card flat bordered>
|
||||
<q-card-section>
|
||||
<div class="row items-center no-wrap">
|
||||
<q-card-section v-html="props.statement" />
|
||||
<div class="col-auto">
|
||||
<q-btn color="grey-7" round flat icon="more_vert">
|
||||
<q-menu cover auto-close>
|
||||
<q-list>
|
||||
<q-item clickable>
|
||||
<q-item-section @click="() => $emit('edit')">Edit</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable>
|
||||
<q-item-section @click="() => $emit('remove')">Remove</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
</Draggable>
|
||||
</template>
|
||||
|
||||
<style lang="sass" scoped></style>
|
||||
@@ -16,9 +16,7 @@ function increment() {
|
||||
<div>Grid with component</div>
|
||||
|
||||
<q-btn @click="increment">Count is: {{ count }}</q-btn>
|
||||
<q-card class="my-card">
|
||||
hi
|
||||
</q-card>
|
||||
|
||||
</div>
|
||||
</Draggable>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user