Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/manogi/nova-tiptap
Browse files Browse the repository at this point in the history
  • Loading branch information
bastihilger committed Jul 1, 2022
2 parents e4279cb + e676813 commit 32dc5fe
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 33 deletions.
2 changes: 1 addition & 1 deletion dist/js/field.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions dist/js/field.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
*/

/*!
* Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.1.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2022 Fonticons, Inc.
*/

/*!
* Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com
* Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
* Copyright 2022 Fonticons, Inc.
*/

/*!
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"production": "mix --production"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.15.3",
"@fortawesome/fontawesome-pro": "^5.15.3",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/pro-regular-svg-icons": "^5.15.3",
"@fortawesome/pro-solid-svg-icons": "^5.15.3",
"@fortawesome/fontawesome-free": "^6.1.0",
"@fortawesome/fontawesome-pro": "^6.1.0",
"@fortawesome/fontawesome-svg-core": "^6.1.0",
"@fortawesome/free-solid-svg-icons": "^6.1.0",
"@fortawesome/pro-regular-svg-icons": "^6.1.0",
"@fortawesome/pro-solid-svg-icons": "^6.1.0",
"@fortawesome/vue-fontawesome": "^3.0.0-5",
"@vue/compiler-sfc": "^3.2.33",
"cross-env": "^7.0",
Expand Down Expand Up @@ -66,6 +66,7 @@
"i": "^0.3.6",
"laravel-nova": "^1.12.3",
"lodash": "^4.17.21",
"lowlight": "^2.6.1",
"npm": "^7.17.0",
"portal-vue": "^2.1.7",
"pretty": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/FormField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ import EditHtml from './EditHtml';
import Gapcursor from '@tiptap/extension-gapcursor';
import lowlight from 'lowlight';
import {lowlight} from 'lowlight';
import pretty from 'pretty';
import buttonHovers from '../mixins/buttonHovers';
Expand Down
49 changes: 26 additions & 23 deletions resources/js/components/Modal.vue
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
<template>
<div
class="
fixed top-0 left-0
w-full h-full
z-50 flex items-center justify-center
"
v-show="isActive"
>
<div
class="rounded-lg shadow-lg overflow-hidden z-20"
style="width: 800px; max-width: 100%"
<teleport to="#modals">
<div
class="
fixed top-0 left-0
w-full h-full
z-50 flex items-center justify-center
"
style="z-index: 999"
v-show="isActive"
>

<slot />
<div
class="rounded-lg shadow-lg overflow-hidden z-20"
style="width: 800px; max-width: 100%"
>

<slot />

</div>
</div>

<div
class="
z-10 absolute top-0 left-0 w-full h-full
bg-black
"
style="opacity: 0.5"
@click="hideMethod"
>
<div
class="
z-10 absolute top-0 left-0 w-full h-full
bg-black
"
style="opacity: 0.5"
@click="hideMethod"
>
</div>
</div>
</div>
</teleport>
</template>

<script>
Expand Down

0 comments on commit 32dc5fe

Please sign in to comment.