From 008c36d5f39e5f9722efe6530b31ce0ca2ccf450 Mon Sep 17 00:00:00 2001
From: Joy Zhong <joytzhong@gmail.com>
Date: Thu, 7 Nov 2019 10:55:51 -0500
Subject: [PATCH] Move aria attrs from container to surface.

---
 packages/mdc-dialog/README.md                        | 12 ++++++------
 .../spec/mdc-dialog/mixins/container-fill-color.html | 12 ++++++------
 .../spec/mdc-dialog/mixins/content-ink-color.html    | 12 ++++++------
 .../spec/mdc-dialog/mixins/max-height.html           | 12 ++++++------
 .../screenshot/spec/mdc-dialog/mixins/max-width.html | 12 ++++++------
 .../screenshot/spec/mdc-dialog/mixins/min-width.html | 12 ++++++------
 .../spec/mdc-dialog/mixins/scrim-color.html          | 12 ++++++------
 .../spec/mdc-dialog/mixins/scroll-divider-color.html | 12 ++++++------
 .../spec/mdc-dialog/mixins/shape-radius.html         | 12 ++++++------
 .../spec/mdc-dialog/mixins/title-ink-color.html      | 12 ++++++------
 10 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/packages/mdc-dialog/README.md b/packages/mdc-dialog/README.md
index e1447d77b58..a449aade04e 100644
--- a/packages/mdc-dialog/README.md
+++ b/packages/mdc-dialog/README.md
@@ -41,12 +41,12 @@ npm install @material/dialog
 
 ```html
 <div class="mdc-dialog">
-  <div class="mdc-dialog__container"
+  <div class="mdc-dialog__container">
+    <div class="mdc-dialog__surface"
       role="alertdialog"
       aria-modal="true"
       aria-labelledby="my-dialog-title"
       aria-describedby="my-dialog-content">
-    <div class="mdc-dialog__surface">
       <!-- Title cannot contain leading whitespace due to mdc-typography-baseline-top() -->
       <h2 class="mdc-dialog__title" id="my-dialog-title"><!--
      -->Dialog Title<!--
@@ -115,12 +115,12 @@ The Simple Dialog contains a list of potential actions. It does not contain butt
 
 ```html
 <div class="mdc-dialog">
-  <div class="mdc-dialog__container"
+  <div class="mdc-dialog__container">
+    <div class="mdc-dialog__surface"
       role="alertdialog"
       aria-modal="true"
       aria-labelledby="my-dialog-title"
       aria-describedby="my-dialog-content">
-    <div class="mdc-dialog__surface">
       <!-- Title cannot contain leading whitespace due to mdc-typography-baseline-top() -->
       <h2 class="mdc-dialog__title" id="my-dialog-title"><!--
      -->Choose a Ringtone<!--
@@ -151,12 +151,12 @@ radio buttons (indicating single selection) or checkboxes (indicating multiple s
 
 ```html
 <div class="mdc-dialog">
-  <div class="mdc-dialog__container"
+  <div class="mdc-dialog__container">
+    <div class="mdc-dialog__surface"
       role="alertdialog"
       aria-modal="true"
       aria-labelledby="my-dialog-title"
       aria-describedby="my-dialog-content">
-    <div class="mdc-dialog__surface">
       <!-- Title cannot contain leading whitespace due to mdc-typography-baseline-top() -->
       <h2 class="mdc-dialog__title" id="my-dialog-title"><!--
      -->Choose a Ringtone<!--
diff --git a/test/screenshot/spec/mdc-dialog/mixins/container-fill-color.html b/test/screenshot/spec/mdc-dialog/mixins/container-fill-color.html
index 2e553991644..0c760933b1e 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/container-fill-color.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/container-fill-color.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--container-fill-color"
            id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-            role="alertdialog"
-            aria-modal="true"
-            aria-labelledby="test-dialog__title"
-            aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/content-ink-color.html b/test/screenshot/spec/mdc-dialog/mixins/content-ink-color.html
index cc5d5aede43..958e268069e 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/content-ink-color.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/content-ink-color.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--content-ink-color"
            id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-            role="alertdialog"
-            aria-modal="true"
-            aria-labelledby="test-dialog__title"
-            aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/max-height.html b/test/screenshot/spec/mdc-dialog/mixins/max-height.html
index ec3287b1f44..b44d37f0657 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/max-height.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/max-height.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--max-height"
            id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-            role="alertdialog"
-            aria-modal="true"
-            aria-labelledby="test-dialog__title"
-            aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/max-width.html b/test/screenshot/spec/mdc-dialog/mixins/max-width.html
index 172ee66edf6..e649d1a0b69 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/max-width.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/max-width.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--max-width"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--5-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/min-width.html b/test/screenshot/spec/mdc-dialog/mixins/min-width.html
index cc91ea8a10f..39441ef9d21 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/min-width.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/min-width.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--min-width"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title" id="test-dialog__title">Title</h2>
             <div class="mdc-dialog__content test-dialog__content" id="test-dialog__content">
               <div class="test-dialog__content-rect">
diff --git a/test/screenshot/spec/mdc-dialog/mixins/scrim-color.html b/test/screenshot/spec/mdc-dialog/mixins/scrim-color.html
index 402f5e6f88a..01eaf3e02e4 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/scrim-color.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/scrim-color.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--scrim-color"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/scroll-divider-color.html b/test/screenshot/spec/mdc-dialog/mixins/scroll-divider-color.html
index 9367a348b6b..7dd2c56ac44 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/scroll-divider-color.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/scroll-divider-color.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--scroll-divider-color"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/shape-radius.html b/test/screenshot/spec/mdc-dialog/mixins/shape-radius.html
index 312a208c67b..0fad3299bc6 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/shape-radius.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/shape-radius.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--shape-radius"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>
diff --git a/test/screenshot/spec/mdc-dialog/mixins/title-ink-color.html b/test/screenshot/spec/mdc-dialog/mixins/title-ink-color.html
index 402c67157bd..49ad75d4315 100644
--- a/test/screenshot/spec/mdc-dialog/mixins/title-ink-color.html
+++ b/test/screenshot/spec/mdc-dialog/mixins/title-ink-color.html
@@ -42,12 +42,12 @@
       <div class="mdc-dialog mdc-dialog--open test-dialog test-dialog--title-ink-color"
           id="test-dialog">
         <div class="mdc-dialog__scrim"></div>
-        <div class="mdc-dialog__container"
-           role="alertdialog"
-           aria-modal="true"
-           aria-labelledby="test-dialog__title"
-           aria-describedby="test-dialog__content">
-          <div class="mdc-dialog__surface">
+        <div class="mdc-dialog__container">
+          <div class="mdc-dialog__surface"
+              role="alertdialog"
+              aria-modal="true"
+              aria-labelledby="test-dialog__title"
+              aria-describedby="test-dialog__content">
             <h2 class="mdc-dialog__title test-dialog__title test-dialog__title--3-line" id="test-dialog__title"><!--
            -->“The Count of Monte Cristo” by Alexandre <span class="test-font--redact-all">Dumas</span>.<br>
               Published in 1844 and translated by Robin Buss.<br>