From 09a033096f701aaea0bb98f536ce3844a86d2da1 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 2 Feb 2021 18:36:38 +0300 Subject: [PATCH 1/2] fixed uploaded error --- .../media-field_type/src/Http/Controller/UploadController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 94df2818d..0fdc0bdf4 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -131,7 +131,7 @@ class UploadController extends AdminController $w = $image->width() / 2; $h1 = $image->height() / 2; $font_size = $w / 20; - $image->text(setting_value('visiosoft.module.advs::watermark_text','Openclassify'), $w, $h1, function ($font) use ($v, $h, $font_size) { + $image->text(($watermark_text = setting_value('visiosoft.module.advs::watermark_text')) ? $watermark_text : 'Openclassify', $w, $h1, function ($font) use ($v, $h, $font_size) { $font->file(public_path('Antonio-Bold.ttf')); $font->size($font_size); $font->align($h); From 6e5955574a37acece4ec767af5298c962138352a Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 2 Feb 2021 18:37:16 +0300 Subject: [PATCH 2/2] fixed col-6 --- .../visiosoft/defaultadmin-theme/resources/css/theme.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css index cbc0af57c..620fb2fdb 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css +++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css @@ -2764,4 +2764,5 @@ body { /** bootstrap 4.1 Column Fix**/ -.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%} \ No newline at end of file +.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%} +.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%} \ No newline at end of file