hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-27 16:14:39 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #936 from openclassify/vedatak

Browse Source 
Vedatak
This commit is contained in:
Dia Shalabi 2021-02-06 15:46:52 +03:00 committed by GitHub
commit 835d9f5d77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
View File

@ -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%}
.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%}

2
addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
View File

@ -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);