fix(dialog): Fix z-index & wrong CSS (#1094)

Resolves #1095 #1096
material-components · Aug 28, 2017 · 88b7167 · 88b7167
1 parent bb61827
commit 88b7167
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/demos/dialog.html b/demos/dialog.html
@@ -113,6 +113,29 @@ <h2 id="mdc-dialog-default-label" class="mdc-dialog__header__title">
           </div>
           <div class="mdc-dialog__backdrop"></div>
         </aside>
+
+        <aside id="mdc-dialog-colored-footer-buttons"
+        	    class="mdc-dialog"
+        	    role="alertdialog"
+        	    aria-hidden="true"
+        	    aria-labelledby="mdc-dialog-colored-footer-button-label"
+        	    aria-describedby="mdc-dialog-colored-footer-button-description">
+    	    <div class="mdc-dialog__surface">
+    	      <header class="mdc-dialog__header">
+    	        <h2 id="mdc-dialog-colored-footer-button-label" class="mdc-dialog__header__title">
+    	          Use Google's location service?
+    	        </h2>
+    	      </header>
+    	      <section id="mdc-dialog-colored-footer-button-description" class="mdc-dialog__body">
+    	        Let Google help apps determine location. This means sending anonymous location data to Google, even when no apps are running.
+    	      </section>
+    	      <footer class="mdc-dialog__footer">
+    	        <button type="button" class="mdc-button mdc-dialog__footer__button mdc-dialog__footer__button--cancel">Decline</button>
+    	        <button type="button" class="mdc-button mdc-dialog__footer__button mdc-dialog__footer__button--accept mdc-dialog__action">Accept</button>
+    	      </footer>
+    	    </div>
+    	    <div class="mdc-dialog__backdrop"></div>
+      	</aside>
 
         <aside id="mdc-dialog-with-list"
                class="mdc-dialog"
@@ -151,6 +174,7 @@ <h2 id="mdc-dialog-with-list-label" class="mdc-dialog__header__title">
       </div>
       <section class="example">
         <button id="default-dialog-activation" class="mdc-button mdc-button--primary mdc-button--raised">Show Dialog</button>
+        <button id="colored-footer-button-dialog-activation" class="mdc-button mdc-button--primary mdc-button--raised">Show Colored Footer Button Dialog</button>
         <button id="dialog-with-list-activation" class="mdc-button mdc-button--primary mdc-button--raised">Show Scrolling Dialog</button>
         <div class="mdc-form-field">
           <div class="mdc-checkbox">
@@ -234,7 +258,12 @@ <h2 id="mdc-dialog-default-label" class="mdc-dialog__header__title">
         document.querySelector('#dialog-with-list-activation').addEventListener('click', function (evt) {
           dialogScrollable.lastFocusedTarget = evt.target;
           dialogScrollable.show();
-        });
+      	});
+        var dialogColoredButton = new mdc.dialog.MDCDialog(document.querySelector('#mdc-dialog-colored-footer-buttons'));
+        document.querySelector('#colored-footer-button-dialog-activation').addEventListener('click', function (evt) {
+      	  dialogColoredButton.lastFocusedTarget = evt.target;
+          dialogColoredButton.show();
+      	});
       })();
     </script>
     <script>
@@ -255,6 +284,7 @@ <h2 id="mdc-dialog-default-label" class="mdc-dialog__header__title">
         setTimeout(function() {
           mdc.ripple.MDCRipple.attachTo(document.querySelector('#default-dialog-activation'));
           mdc.ripple.MDCRipple.attachTo(document.querySelector('#dialog-with-list-activation'));
+          mdc.ripple.MDCRipple.attachTo(document.querySelector('#colored-footer-button-dialog-activation'));
         }, 200);
       })();
     </script>

diff --git a/packages/mdc-dialog/README.md b/packages/mdc-dialog/README.md
@@ -116,13 +116,14 @@ They only need to match the values set for their corresponding aria attributes.
 
 Dialog actions use system colors by default, but you can use a contrasting color, such as the palette’s secondary color, to distinguish dialog actions from dialog content. To emphasize an action from other contents, add `mdc-dialog__action` to `mdc-button` to apply secondary color.
 
-```
+```html
 <aside class="mdc-dialog">
   <div class="mdc-dialog__surface">
     <footer class="mdc-dialog__footer">
       <button type="button" class="mdc-button mdc-dialog__footer__button mdc-dialog__footer__button--cancel">Decline</button>
       <button type="button" class="mdc-button mdc-dialog__footer__button mdc-dialog__footer__button--accept mdc-dialog__action">Accept</button>
     </footer>
+  </div>
 </aside>
 ```
 

diff --git a/packages/mdc-dialog/mdc-dialog.scss b/packages/mdc-dialog/mdc-dialog.scss
@@ -39,7 +39,7 @@ $mdc-dialog-dark-theme-bg-color: #303030 !default;
   width: 100%;
   height: 100%;
   visibility: hidden;
-  z-index: 2;
+  z-index: 5;
 
   &__backdrop {
     position: fixed;
@@ -141,10 +141,10 @@ $mdc-dialog-dark-theme-bg-color: #303030 !default;
         @include mdc-rtl-reflexive-box(margin, right, 0);
       }
     }
+  }
 
-    &__action {
-      @include mdc-theme-prop(color, secondary);
-    }
+  &__action {
+    @include mdc-theme-prop(color, secondary);
   }
 
   // TODO: Replace with breakpoint variable