Merge remote-tracking branch 'origin/master' into feat/snackbar

material-components · Dec 13, 2018 · ee6a96d · ee6a96d
2 parents 83e596a + 08e25f9
commit ee6a96d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/mdc-menu/README.md b/packages/mdc-menu/README.md
@@ -188,6 +188,8 @@ Mixin | Description
 --- | ---
 `mdc-menu-width($width)` | Used to set the `width` of the menu. When used without units (e.g. `4` or `5`) it computes the `width` by multiplying by the base width (`56px`). When used with units (e.g. `240px`, `15%`, or `calc(200px + 10px)` it sets the `width` to the exact value provided.
 
+> See [Menu Surface](../mdc-menu-surface/README.md#sass-mixins) and [List](../mdc-list/README.md#sass-mixins) documentation for additional style customization options.
+
 ## `MDCMenu` Properties and Methods
 
 See [Importing the JS component](../../docs/importing-js.md) for more information on how to import JavaScript.

diff --git a/test/screenshot/golden.json b/test/screenshot/golden.json
@@ -1703,12 +1703,12 @@
     }
   },
   "spec/mdc-textfield/issues/3332.html": {
-    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/12/12/18_21_57_178/spec/mdc-textfield/issues/3332.html?utm_source=golden_json",
+    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/12/13/21_05_36_273/spec/mdc-textfield/issues/3332.html?utm_source=golden_json",
     "screenshots": {
-      "desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/21/19_18_38_795/spec/mdc-textfield/issues/3332.html.windows_chrome_70.png",
-      "desktop_windows_edge@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/12/12/18_21_57_178/spec/mdc-textfield/issues/3332.html.windows_edge_17.png",
-      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/21/19_18_38_795/spec/mdc-textfield/issues/3332.html.windows_firefox_63.png",
-      "desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/11/21/19_18_38_795/spec/mdc-textfield/issues/3332.html.windows_ie_11.png"
+      "desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/12/13/21_05_36_273/spec/mdc-textfield/issues/3332.html.windows_chrome_71.png",
+      "desktop_windows_edge@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/12/13/20_27_21_498/spec/mdc-textfield/issues/3332.html.windows_edge_17.png",
+      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/12/13/21_05_36_273/spec/mdc-textfield/issues/3332.html.windows_firefox_63.png",
+      "desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/12/13/21_05_36_273/spec/mdc-textfield/issues/3332.html.windows_ie_11.png"
     }
   },
   "spec/mdc-textfield/mixins/outline-shape-radius.html": {

diff --git a/test/screenshot/spec/mdc-textfield/issues/3332.html b/test/screenshot/spec/mdc-textfield/issues/3332.html
@@ -31,7 +31,7 @@
     <link rel="stylesheet" href="../../../out/spec/mdc-textfield/fixture.css">
   </head>
 
-  <body class="test-container">
+  <body class="test-container test-container--edge-fonts">
     <main class="test-viewport test-viewport--mobile">
       <div class="test-layout">
 
@@ -44,20 +44,20 @@
             <div class="mdc-notched-outline mdc-notched-outline--notched">
               <div class="mdc-notched-outline__leading"></div>
               <div class="mdc-notched-outline__notch">
-                <label for="outlined-text-field" class="mdc-floating-label mdc-floating-label--float-above">Label</label>
+                <label for="outlined-text-field" class="mdc-floating-label mdc-floating-label--float-above test-font--redact-all">Label</label>
               </div>
               <div class="mdc-notched-outline__trailing"></div>
             </div>
           </div>
         </div>
 
-        <div class="test-cell test-cell--textfield" style="text-align: center;">
+        <div class="test-cell test-cell--textarea" style="text-align: center;">
           <div class="mdc-text-field mdc-text-field--textarea">
-            <textarea id="textarea" class="mdc-text-field__input" rows="8" cols="40"></textarea>
+            <textarea id="textarea" class="mdc-text-field__input" rows="2" cols="40"></textarea>
             <div class="mdc-notched-outline">
               <div class="mdc-notched-outline__leading"></div>
               <div class="mdc-notched-outline__notch">
-                <label for="textarea" class="mdc-floating-label">Textarea Label</label>
+                <label for="textarea" class="mdc-floating-label test-font--redact-all">Textarea Label</label>
               </div>
               <div class="mdc-notched-outline__trailing"></div>
             </div>