diff --git a/package-lock.json b/package-lock.json index 92a767e6..34c1d450 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,9 +79,9 @@ "svelte-highlight": "^7.8.0", "svelte-idle": "^3.0.1", "svelte-tiptap": "^2.1.0", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^3.0.0", "tailwind-variants": "^0.3.0", - "tailwindcss": "^3.4.15", + "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tslib": "^2.4.1", "typescript": "^5.0.0", @@ -3980,16 +3980,6 @@ "svelte": "^3.55.1 || ^4.0.0 || ^5.0.0" } }, - "node_modules/flowbite-svelte/node_modules/tailwind-merge": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz", - "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/dcastil" - } - }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -7043,10 +7033,9 @@ "license": "MIT" }, "node_modules/tailwind-merge": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", - "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz", + "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==", "license": "MIT", "funding": { "type": "github", diff --git a/package.json b/package.json index 2e3157c0..8f0eafdb 100644 --- a/package.json +++ b/package.json @@ -74,9 +74,9 @@ "svelte-highlight": "^7.8.0", "svelte-idle": "^3.0.1", "svelte-tiptap": "^2.1.0", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^3.0.0", "tailwind-variants": "^0.3.0", - "tailwindcss": "^3.4.15", + "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tslib": "^2.4.1", "typescript": "^5.0.0", diff --git a/src/app.css b/src/app.css new file mode 100644 index 00000000..cd670237 --- /dev/null +++ b/src/app.css @@ -0,0 +1,3 @@ +@import 'tailwindcss'; +@plugin '@tailwindcss/forms'; +@plugin '@tailwindcss/typography'; diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte index 6fac23d0..14663912 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte @@ -3,7 +3,7 @@ export let log_lvl: number = 0; // Imports // Import components and elements -import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte'; +// import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte'; // Import storage, functions, and libraries import type { key_val } from '$lib/ae_stores'; @@ -17,15 +17,15 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$ export let link_to_type: string; export let link_to_id: string; -export let input_name = 'file_list'; -export let multiple: boolean = true; -export let required: boolean = true; -export let accept: string = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh'; +// export let input_name = 'file_list'; +// export let multiple: boolean = true; +// export let required: boolean = true; +// export let accept: string = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh'; export let class_li_default: string = 'flex flex-col gap-1 items-center justify-center w-full max-w-2xl mx-auto my-1'; export let class_li: string = ''; -export let input_class_li: string[] = ['file_drop_area']; -export let table_class_li: string[] = ['table', 'table-sm', 'table-striped', 'table-hover' , 'text-sm']; +// export let input_class_li: string[] = ['file_drop_area']; +// export let table_class_li: string[] = ['table', 'table-sm', 'table-striped', 'table-hover' , 'text-sm']; export let clip_complete: boolean = false; // export let upload_complete: boolean = false; diff --git a/src/lib/element_manage_hosted_file_li.svelte b/src/lib/element_manage_hosted_file_li.svelte index c568c7bf..de802647 100644 --- a/src/lib/element_manage_hosted_file_li.svelte +++ b/src/lib/element_manage_hosted_file_li.svelte @@ -1,12 +1,12 @@