From 4e6043fd6b8853a6ea20fab6d9f71e21f35f0825 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Mon, 5 Mar 2018 17:37:05 +0100 Subject: Fixed tooltip positionning & error display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/files.scss | 5 +++-- apps/files/js/newfilemenu.js | 2 +- core/css/inputs.scss | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 3012ca171aa..f2d2e7d54f3 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -38,10 +38,11 @@ font-weight: normal; } -.newFileMenu .error, #fileList .error { +.newFileMenu .error, +.newFileMenu .error + .icon-confirm, +#fileList .error { color: $color-error; border-color: $color-error; - box-shadow: 0 0 6px #f8b9b7; } /* FILE TABLE */ diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index 0b28e158fe0..e27ccd9771f 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -157,7 +157,7 @@ } } catch (error) { $input.attr('title', error); - $input.tooltip({placement: 'right', trigger: 'manual'}); + $input.tooltip({placement: 'right', trigger: 'manual', 'container': '.newFileMenu'}); $input.tooltip('fixTitle'); $input.tooltip('show'); $input.addClass('error'); diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 91f74fbf1fa..0e2a7483041 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -222,6 +222,7 @@ input { border-left-color: transparent !important; border-radius: 0 $border-radius $border-radius 0 !important; background-clip: padding-box; /* Avoid background under border */ + background-color: $color-main-background !important; } /* only show confirm borders if input is not focused */ &:not(:active):not(:hover):not(:focus){ -- cgit v1.2.3