Merge pull request #2094 from infor-design/2073-datagrid-dropdown-bor…

…ders 2073 - Fixed dropdown border colors for iOS with datagrid [v4.18.x]
infor-design · May 3, 2019 · 060f157 · 060f157
2 parents 8e9ba32 + d55ac11
commit 060f157
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss
@@ -2502,7 +2502,7 @@ $datagrid-short-row-height: 23px;
         width: 16px;
       }
 
-      div.dropdown {
+      div.dropdown:not(.is-disabled) {
         border: 1px solid $datagrid-filter-border-color;
 
         &:hover {
@@ -3989,11 +3989,17 @@ html[dir='rtl'] {
 }
 
 // Ios Hacks
-.ios .datagrid:not(.short-rowheight):not(.medium-rowheight) {
-  .icon-error,
-  .icon-success,
-  .icon-pending {
-    top: 15px !important;
+.ios {
+  .datagrid:not(.short-rowheight):not(.medium-rowheight) {
+    .icon-error,
+    .icon-success,
+    .icon-pending {
+      top: 15px !important;
+    }
+  }
+
+  .datagrid-header .datagrid-filter-wrapper .dropdown.is-disabled {
+    opacity: 0.4;
   }
 }