From 9dba9ca17879c047e3927123d793329937066ea3 Mon Sep 17 00:00:00 2001 From: abijeet Date: Sun, 27 Jan 2019 19:43:31 +0530 Subject: [PATCH 1/2] Fixes tooltip on the image manager. Fixes #1186 --- resources/assets/sass/_components.scss | 7 +++---- resources/lang/en/validation.php | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss index d00d1fe9a..7604705f7 100644 --- a/resources/assets/sass/_components.scss +++ b/resources/assets/sass/_components.scss @@ -210,7 +210,6 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group { .image-manager-sidebar { width: 300px; - margin-left: 1px; overflow-y: auto; overflow-x: hidden; border-left: 1px solid #DDD; @@ -524,8 +523,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group { font-size: 12px; line-height: 1.2; top: 88px; - left: -26px; - width: 148px; + left: -12px; + width: 160px; background: $negative; padding: $-xs; color: white; @@ -535,7 +534,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group { content: ''; position: absolute; top: -6px; - left: 64px; + left: 52px; width: 0; height: 0; border-left: 6px solid transparent; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 0b6a1c170..e05cfca9d 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -69,6 +69,7 @@ return [ 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.', + 'is_image' => 'The :attribute must be a valid image.', // Custom validation lines 'custom' => [ From 6be95cd2ac0232c8dd290bbcd5d268eb1f72154d Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 8 Mar 2019 22:57:24 +0000 Subject: [PATCH 2/2] Re-centered dropzone error arrow --- resources/assets/sass/_components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss index 7604705f7..1f34166c6 100644 --- a/resources/assets/sass/_components.scss +++ b/resources/assets/sass/_components.scss @@ -534,7 +534,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group { content: ''; position: absolute; top: -6px; - left: 52px; + left: 44px; width: 0; height: 0; border-left: 6px solid transparent;