diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-05 17:37:05 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-07 13:17:37 +0100 |
| commit | 4e6043fd6b8853a6ea20fab6d9f71e21f35f0825 (patch) | |
| tree | 19886f01762dab4b4086757f2b242820bcbae74f | |
| parent | 955c2ee1a7d4936aa5fc4168cb1c8bff41f7ad8b (diff) | |
| download | nextcloud-server-4e6043fd6b8853a6ea20fab6d9f71e21f35f0825.tar.gz nextcloud-server-4e6043fd6b8853a6ea20fab6d9f71e21f35f0825.zip | |
Fixed tooltip positionning & error display
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/files/css/files.scss | 5 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 2 | ||||
| -rw-r--r-- | 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){ |