Merged in ashakya-style-106 (pull request #33)

OWC-253 Resolved label issue for select control and tooltip positioining Approved-by: Diego Garcia <[email protected]> Approved-by: Matt Goldspink <[email protected]>
vlocityinc · Jul 12, 2019 · a46434b · a46434b
2 parents 7c18c99 + d135c14
commit a46434b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git 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: -0.6875rem;
+    top: 0.5rem;
+}
diff --git a/ui/components/form-element/animate/_index.scss b/ui/components/form-element/animate/_index.scss
@@ -199,3 +199,22 @@ textarea:focus::placeholder {
 .nds-form-element__control.nds-form-element__control-animated-label .nds-animated-label__ease-out {
   transition: transform 200ms ease-out, font-size 200ms ease-out
 }
+
+.nds-combobox_container .nds-combobox__form-element.nds-form-element__control.nds-form-element__control-animated-label input[readonly] {
+  padding-left: 0;
+
+  &:focus {
+    box-shadow: none;
+    & ~ label {
+      transform: translate3d(0px, -1.2rem, 0px);
+    }
+  }
+
+  & ~ label {
+    transform: none;
+  }
+
+  &.nds-input.nds-not-empty.nds-is-dirty ~ label {
+        transform: translate3d(0px, -1.2rem, 0px);
+  }
+}
diff --git 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;
 }