From f72faeec2831c788149394a8807aaa2297bdb379 Mon Sep 17 00:00:00 2001 From: Avnesh Shakya Date: Wed, 10 Jul 2019 21:39:28 +0530 Subject: [PATCH 1/2] OWC-253 Resolved label issue for select control and tooltip positioining --- ui/components/combobox/base/_index.scss | 5 +++++ ui/components/form-element/animate/_index.scss | 16 ++++++++++++++++ ui/components/tooltips/base/_index.scss | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/ui/components/combobox/base/_index.scss b/ui/components/combobox/base/_index.scss index eb46ed93a5..9c5d8c1f66 100644 --- a/ui/components/combobox/base/_index.scss +++ b/ui/components/combobox/base/_index.scss @@ -371,3 +371,8 @@ box-shadow: 0 0 0 2px #fff inset, 0 0 0 3px $color-border inset; } } + +.nds-combobox_container .nds-tooltip_container { + right: -11px; + top: 8px; +} diff --git a/ui/components/form-element/animate/_index.scss b/ui/components/form-element/animate/_index.scss index e3ad0fc3c0..9e4fea6505 100644 --- a/ui/components/form-element/animate/_index.scss +++ b/ui/components/form-element/animate/_index.scss @@ -172,3 +172,19 @@ textarea:focus::placeholder { color: inherit; } +.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly] { + padding-left: 0; +} + +.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly]:focus { + box-shadow: none; +} + +.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly] ~ label { + transform: none; +} + +.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly]:focus ~ label, +.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly].nds-input.nds-not-empty.nds-is-dirty ~ label { + transform: translate3d(0px, -1.2rem, 0px); +} \ No newline at end of file diff --git a/ui/components/tooltips/base/_index.scss b/ui/components/tooltips/base/_index.scss index 002330bf16..2b833b1f0e 100644 --- a/ui/components/tooltips/base/_index.scss +++ b/ui/components/tooltips/base/_index.scss @@ -128,4 +128,9 @@ .nds-radio-relative-tooltip .nds-tooltip_container { top: -3px; +} + +.nds-datetime-tooltip span { + position: relative; + top: 1.25rem; } \ No newline at end of file From d135c14143f329ec6543437e9b9d31e7bb738dea Mon Sep 17 00:00:00 2001 From: Avnesh Shakya Date: Thu, 11 Jul 2019 18:37:25 +0530 Subject: [PATCH 2/2] replaced px to rem --- ui/components/combobox/base/_index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/components/combobox/base/_index.scss b/ui/components/combobox/base/_index.scss index 9c5d8c1f66..96c7bd8e20 100644 --- a/ui/components/combobox/base/_index.scss +++ b/ui/components/combobox/base/_index.scss @@ -373,6 +373,6 @@ } .nds-combobox_container .nds-tooltip_container { - right: -11px; - top: 8px; + right: -0.6875rem; + top: 0.5rem; }