diff --git a/media/custom/favicon-114x114.png b/media/custom/favicon-114x114.png deleted file mode 100644 index dc2e17a..0000000 Binary files a/media/custom/favicon-114x114.png and /dev/null differ diff --git a/media/custom/favicon-144x144.png b/media/custom/favicon-144x144.png deleted file mode 100644 index 9f4ebae..0000000 Binary files a/media/custom/favicon-144x144.png and /dev/null differ diff --git a/media/custom/favicon-16x16.png b/media/custom/favicon-16x16.png deleted file mode 100644 index 04b4932..0000000 Binary files a/media/custom/favicon-16x16.png and /dev/null differ diff --git a/media/custom/favicon-180x180.png b/media/custom/favicon-180x180.png deleted file mode 100644 index ddca050..0000000 Binary files a/media/custom/favicon-180x180.png and /dev/null differ diff --git a/media/custom/favicon-32x32.png b/media/custom/favicon-32x32.png deleted file mode 100644 index 6b96a4f..0000000 Binary files a/media/custom/favicon-32x32.png and /dev/null differ diff --git a/media/custom/favicon-72x72.png b/media/custom/favicon-72x72.png deleted file mode 100644 index 3fcd8ef..0000000 Binary files a/media/custom/favicon-72x72.png and /dev/null differ diff --git a/system/typemill/Controllers/ControllerApiImage.php b/system/typemill/Controllers/ControllerApiImage.php index a545470..4498765 100644 --- a/system/typemill/Controllers/ControllerApiImage.php +++ b/system/typemill/Controllers/ControllerApiImage.php @@ -189,8 +189,11 @@ class ControllerApiImage extends Controller } # for all other image types, check if they should be transformed to webp - if($this->settingActive('convertwebp')) + if(!isset($params['keepformat']) && $this->settingActive('convertwebp')) { + echo '
'; + var_dump($params); + die('set wp'); $media->setExtension('webp'); } diff --git a/system/typemill/Models/Storage.php b/system/typemill/Models/Storage.php index 1bea062..40f36cc 100644 --- a/system/typemill/Models/Storage.php +++ b/system/typemill/Models/Storage.php @@ -741,7 +741,7 @@ class Storage if(!$storedImage) { - $this->errors[] = Translations::translate('Could not store the custom size of') . ' ' . $imageName; + $this->error = Translations::translate('Could not store the custom size of') . ' ' . $imageName; return false; } diff --git a/system/typemill/author/css/custom.css b/system/typemill/author/css/custom.css index 7a214bc..f30904b 100644 --- a/system/typemill/author/css/custom.css +++ b/system/typemill/author/css/custom.css @@ -52,11 +52,20 @@ .fade-enter-active, .fade-leave-active { transition: opacity 0.5s ease-in-out; } - .fade-enter, .fade-leave-to { opacity: 0; } +/* enter or fade items in list with transition group */ +.list-enter-active, .list-leave-active { + transition: all 0.2s; +} +.list-enter, .list-leave-to { + opacity: 0; +} + + + .accordion-enter-active, .accordion-leave-active { transition: max-height 0.5s ease, padding 0.5s ease; overflow: hidden; diff --git a/system/typemill/author/js/vue-forms.js b/system/typemill/author/js/vue-forms.js index 49e697d..ab6a42d 100644 --- a/system/typemill/author/js/vue-forms.js +++ b/system/typemill/author/js/vue-forms.js @@ -741,7 +741,7 @@ app.component('component-customfields', { app.component('component-image', { - props: ['id', 'description', 'maxlength', 'hidden', 'readonly', 'required', 'disabled', 'placeholder', 'label', 'name', 'type', 'value', 'css', 'errors'], + props: ['id', 'description', 'maxlength', 'hidden', 'readonly', 'required', 'disabled', 'placeholder', 'label', 'name', 'type', 'value', 'css', 'errors', 'keepformat'], components: { medialib: medialib }, @@ -900,6 +900,7 @@ app.component('component-image', { { sharedself = this; + let keepformat = this.keepformat ? true : false; let reader = new FileReader(); reader.readAsDataURL(imageFile); reader.onload = function(e) @@ -910,6 +911,7 @@ app.component('component-image', { 'image': e.target.result, 'name': imageFile.name, 'publish': true, + 'keepformat': keepformat }) .then(function (response) { sharedself.update(response.data.name); diff --git a/system/typemill/settings/system.yaml b/system/typemill/settings/system.yaml index dd41ceb..e24e6e5 100644 --- a/system/typemill/settings/system.yaml +++ b/system/typemill/settings/system.yaml @@ -73,6 +73,7 @@ fieldsetmedia: type: image label: Favicon description: 'Only PNG format will work.' + keepformat: true liveimagewidth: type: number label: 'Standard width for live pictures' diff --git a/themes/cyanine/landingpage.twig b/themes/cyanine/landingpage.twig index d699bb6..c24a896 100644 --- a/themes/cyanine/landingpage.twig +++ b/themes/cyanine/landingpage.twig @@ -4,7 +4,7 @@