From 32a23239487e1202dd81cce8dde88bc87e0a02be Mon Sep 17 00:00:00 2001 From: uatrend Date: Wed, 30 Oct 2019 22:18:58 +0500 Subject: [PATCH] Fix styles and PHP 7.3 compability --- .../modules/dashboard/src/Controller/DashboardController.php | 2 +- .../modules/editor/app/assets/tinymce_skin/skin.min.css | 1 + app/system/modules/editor/app/components/link-picker.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/system/modules/dashboard/src/Controller/DashboardController.php b/app/system/modules/dashboard/src/Controller/DashboardController.php index 5530e7d4..d9b207c7 100644 --- a/app/system/modules/dashboard/src/Controller/DashboardController.php +++ b/app/system/modules/dashboard/src/Controller/DashboardController.php @@ -136,6 +136,6 @@ public function weatherAction($data, $action) $data['APPID'] = $this->apiKey; $url .= '?' . http_build_query($data); - return App::response(file_get_contents($url), 200, ['Content-Type' => 'application/json']); + return App::response(file_get_contents((string) $url), 200, ['Content-Type' => 'application/json']); } } diff --git a/app/system/modules/editor/app/assets/tinymce_skin/skin.min.css b/app/system/modules/editor/app/assets/tinymce_skin/skin.min.css index d212f06e..94c68f6f 100755 --- a/app/system/modules/editor/app/assets/tinymce_skin/skin.min.css +++ b/app/system/modules/editor/app/assets/tinymce_skin/skin.min.css @@ -15,6 +15,7 @@ } .tox-fullscreen .tox.tox-tinymce.tox-fullscreen { + width: 100% !important; z-index: 999; } diff --git a/app/system/modules/editor/app/components/link-picker.vue b/app/system/modules/editor/app/components/link-picker.vue index 0cd962bb..0fc6249e 100644 --- a/app/system/modules/editor/app/components/link-picker.vue +++ b/app/system/modules/editor/app/components/link-picker.vue @@ -11,14 +11,14 @@
- +
- +