From b724c36c8219e3b7e8914ba5a1c42fb968b70d92 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 Nov 2016 13:15:27 +0530 Subject: [PATCH] [ui] yet another z-index fix (#2248) --- frappe/public/css/desk.css | 6 +++--- frappe/public/less/desk.less | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 494a91d906..f7a5239d40 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -354,9 +354,6 @@ fieldset[disabled] .form-control { border-bottom: 1px solid #EBEFF2; } /* jquery ui */ -.ui-datepicker { - z-index: 100 !important; -} .ui-datepicker .ui-datepicker-header { border-radius: 0px !important; } @@ -468,6 +465,9 @@ fieldset[disabled] .form-control { .form-control input { padding: 6px 10px 8px; } +.link-field.ui-front { + z-index: inherit; +} .modal .hasDatepicker { z-index: 1140; } diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index c170b2abdf..0a40377748 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -144,9 +144,6 @@ textarea.form-control { /* jquery ui */ -.ui-datepicker { - z-index: 100 !important; -} .ui-datepicker .ui-datepicker-header { border-radius: 0px !important; @@ -287,6 +284,10 @@ textarea.form-control { } } +.link-field.ui-front { + z-index: inherit; +} + .modal .hasDatepicker { z-index: 1140; }