Merge branch 'madeline/fix-conflicting-zindexes'

Author: Madeline Trotter

src/Lumi/Components/InputGroup.purs

@@ -3,6 +3,7 @@ module Lumi.Components.InputGroup where
 import Data.Array (fromFoldable)
 import Data.Nullable (Nullable, toMaybe)
 import JSS (JSS, jss)
+import Lumi.Components.ZIndex (ziInputGroup)
 import React.Basic (Component, JSX, createComponent, element, makeStateless)
 import React.Basic.DOM (CSS, unsafeCreateDOMComponent)
 import React.Basic.DOM as R
@@ -43,7 +44,7 @@ styles = jss
           , "& a.input-container":
               { flex: "1"
               , marginRight: "-1px"
-              -- , "&:focus, &:hover": { zIndex: "1" }
+              , "&:focus, &:hover": { zIndex: ziInputGroup }
               , "& input[type=\"text\"], & input.lumi[type=\"text\"]":
                   { borderRadius: "0"
                   , width: "100%"
@@ -73,9 +74,9 @@ styles = jss
               , borderBottomLeftRadius:"0"
               }
 
-          -- , "& input-group-addon button.lumi":
-          --     { "&:focus, &:hover": { zIndex: "1" }
-          --     }
+          , "& input-group-addon button.lumi":
+              { "&:focus, &:hover": { zIndex: ziInputGroup }
+              }
           }
       }
   }

src/Lumi/Components/ZIndex.purs

@@ -1,40 +1,40 @@
 module Lumi.Components.ZIndex where
 
 ziButtonGroup :: Int
-ziButtonGroup = 100
+ziButtonGroup = 1000
 
 ziDropdownButton :: Int
-ziDropdownButton = 100
+ziDropdownButton = 1000
 
 ziInputGroup :: Int
-ziInputGroup = 100
+ziInputGroup = 1000
 
 ziModal :: Int
-ziModal = 1000
+ziModal = 10000
 
 ziNavigationBar :: Int
-ziNavigationBar = 10
+ziNavigationBar = 100
 
 ziNavigationDropdown :: Int
-ziNavigationDropdown = 11
+ziNavigationDropdown = 101
 
 ziSelect :: Int
-ziSelect = 100
+ziSelect = 1000
 
 ziTableHeader :: Int
-ziTableHeader = 2
+ziTableHeader = 12
 
 ziTableHeaderMenu :: Int
-ziTableHeaderMenu = 4
+ziTableHeaderMenu = 14
 
 ziTableLockedColumn :: Int
-ziTableLockedColumn = 1
+ziTableLockedColumn = 11
 
 ziTableLockedColumnHeader :: Int
-ziTableLockedColumnHeader = 3
+ziTableLockedColumnHeader = 13
 
 ziToast :: Int
-ziToast = 10000
+ziToast = 100000
 
 ziTooltip :: Int
-ziTooltip = 100000
+ziTooltip = 1000000