diff --git a/database/seeders/Development/SectionSeeder.php b/database/seeders/Development/SectionSeeder.php index 15802f9..ff35bda 100644 --- a/database/seeders/Development/SectionSeeder.php +++ b/database/seeders/Development/SectionSeeder.php @@ -435,6 +435,7 @@ class SectionSeeder extends Seeder $data, $section->emptyStringBloc([], "Titre h3 de la section numéro 2", fake()->sentence()) ); + $data = array_merge($data, $section->emptyLinkBloc([], 'https://www.google.com', true)); return $data; } diff --git a/resources/assets/images/others/logo-ldc.png b/resources/assets/images/others/logo-ldc.png new file mode 100644 index 0000000..912b387 Binary files /dev/null and b/resources/assets/images/others/logo-ldc.png differ diff --git a/resources/js/ckUploadAdaptater.js b/resources/js/CKUploadAdapter.js similarity index 94% rename from resources/js/ckUploadAdaptater.js rename to resources/js/CKUploadAdapter.js index 1772f05..e60d7f9 100644 --- a/resources/js/ckUploadAdaptater.js +++ b/resources/js/CKUploadAdapter.js @@ -1,5 +1,5 @@ import axios from "axios"; -import route from "./../ts/modules/route"; +import route from "../ts/modules/route"; class CKUploadAdapter { constructor(loader) { @@ -58,10 +58,12 @@ class CKUploadAdapter { } } +// export { CKUploadAdapter }; + function CkUploadAdapterPlugin(editor) { editor.plugins.get("FileRepository").createUploadAdapter = (loader) => { return new CKUploadAdapter(loader); }; } -export default CkUploadAdapterPlugin; +export { CkUploadAdapterPlugin }; diff --git a/resources/sass/fo/base/_bootstrap-overload.scss b/resources/sass/fo/base/_bootstrap-overload.scss index 1d02e16..2857503 100644 --- a/resources/sass/fo/base/_bootstrap-overload.scss +++ b/resources/sass/fo/base/_bootstrap-overload.scss @@ -2,3 +2,12 @@ color: $primary; font-weight: bold; } + +.card-text { +/* stylelint-disable */ + display: -webkit-box; +/* stylelint-enable */ + overflow: hidden; + -webkit-box-orient: vertical; + -webkit-line-clamp: 11; +} diff --git a/resources/sass/fo/base/_common.scss b/resources/sass/fo/base/_common.scss index 73a8205..e29ee7d 100644 --- a/resources/sass/fo/base/_common.scss +++ b/resources/sass/fo/base/_common.scss @@ -54,6 +54,10 @@ $theme-colors: map.merge($theme-colors, $light-colors); .key-number { width: 12rem; height: 12rem; + + p { + margin-bottom: 0; + } } // Map on all colors diff --git a/resources/sass/fo/base/_layout.scss b/resources/sass/fo/base/_layout.scss index fd6578f..4bd0d9c 100644 --- a/resources/sass/fo/base/_layout.scss +++ b/resources/sass/fo/base/_layout.scss @@ -180,7 +180,7 @@ body { top: 0; left: 0; width: 100%; - height: $header-height; + min-height: $header-height; border-bottom: #{$color-primary} 0.2rem solid; backdrop-filter: blur(5px); pointer-events: none; diff --git a/resources/ts/bo/components/CkEditorComponent.vue b/resources/ts/bo/components/CkEditorComponent.vue index 2259319..d4b0673 100644 --- a/resources/ts/bo/components/CkEditorComponent.vue +++ b/resources/ts/bo/components/CkEditorComponent.vue @@ -15,9 +15,10 @@