US206196 code revisions

* removed z-index map and reset modal to z-index: 2000
* moved slotted header code to be within pfe-modal__content

Author: chrisdo1

elements/pfe-modal/src/pfe-modal.scss

@@ -8,7 +8,7 @@ $pfe-modal--breakpoint--medium: 640px;
 	--pfe-modal--MinWidth: 50vw;
 	--pfe-modal--MaxWidth--mobile: 94vw;
 	--pfe-modal--MaxHeight: 90vh;
-	--pfe-modal--Padding: calc(#{pfe-var(container-padding)} * 2) calc(#{pfe-var(container-padding)} * 3) calc(#{pfe-var(container-padding)} * 2) calc(#{pfe-var(container-padding)} * 2);
+	--pfe-modal--Padding: calc(#{pfe-var(container-padding)} * 2) calc(#{pfe-var(container-padding)} * 3.5) calc(#{pfe-var(container-padding)} * 2) calc(#{pfe-var(container-padding)} * 2);
 	--pfe-modal__overlay--BackgroundColor: #{pfe-color(overlay)};
 	--pfe-modal__close--size: calc(#{pfe-var(ui--element--size)} - 4px);
 	display: block;
@@ -30,11 +30,10 @@ $pfe-modal--breakpoint--medium: 640px;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		z-index: #{pfe-var($cssvar: modal, $map: $z-index)};
+		z-index: var(--pfe-z--modal, 2000); // Reset this to use the z-index map.
 
 		&[hidden] {
 			display: none;
-			z-index: #{pfe-var($cssvar: content, $map: $z-index)};
 		}
 	}
 	&__overlay {
@@ -71,17 +70,6 @@ $pfe-modal--breakpoint--medium: 640px;
 		&[hidden] {
 			display: none;
 		}
-
-		:host(:not([has_header])) & {
-
-			// Remove margin-top on the first slotted element that is not the header.
-			::slotted(*:nth-child(2)) {
-				margin-top: 0 !important;
-			}
-		}
-		::slotted([slot="pfe-modal--header"]) {
-			margin-top: 0 !important;
-		}
 	}
 
 	&__content {
@@ -99,6 +87,19 @@ $pfe-modal--breakpoint--medium: 640px;
 			box-sizing: border-box;
 			--pfe-modal--Padding: #{pfe-var(container-padding)} calc(#{pfe-var(container-padding)} * 3) #{pfe-var(container-padding)} #{pfe-var(container-padding)};
 		}
+
+		:host(:not([has_header])) & {
+
+			// Remove margin-top on the first slotted element that is not the header.
+			::slotted(*:nth-child(2)),
+			::slotted(*:nth-child(1)) {
+				margin-top: 0 !important;
+			}
+		}
+
+		::slotted([slot="pfe-modal--header"]) {
+			margin-top: 0 !important;
+		}
 	}
 
 	&__close {

elements/pfe-sass/variables/_maps.scss

@@ -227,10 +227,3 @@ $pfe-vars: (
   animation-timing:              cubic-bezier(0.465, 0.183, 0.153, 0.946),
   opacity:                       .3
 );
-
-$z-index: (
-  modal: 99,
-  navigation: 98,
-  overlay: 97,
-  content: 0
-);