Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit ee6a96d

Browse files
acdvorakacdvorak
committed
Merge remote-tracking branch 'origin/master' into feat/snackbar
2 parents 83e596a + 08e25f9 commit ee6a96d

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

‎packages/mdc-menu/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ Mixin | Description
188188
--- | ---
189189
`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.
190190

191+
> See [Menu Surface](../mdc-menu-surface/README.md#sass-mixins) and [List](../mdc-list/README.md#sass-mixins) documentation for additional style customization options.
192+
191193
## `MDCMenu` Properties and Methods
192194

193195
See [Importing the JS component](../../docs/importing-js.md) for more information on how to import JavaScript.

‎test/screenshot/golden.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,12 +1703,12 @@
17031703
}
17041704
},
17051705
"spec/mdc-textfield/issues/3332.html": {
1706-
"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",
1706+
"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",
17071707
"screenshots": {
1708-
"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",
1709-
"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",
1710-
"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",
1711-
"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"
1708+
"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",
1709+
"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",
1710+
"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",
1711+
"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"
17121712
}
17131713
},
17141714
"spec/mdc-textfield/mixins/outline-shape-radius.html": {

‎test/screenshot/spec/mdc-textfield/issues/3332.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<link rel="stylesheet" href="../../../out/spec/mdc-textfield/fixture.css">
3232
</head>
3333

34-
<body class="test-container">
34+
<body class="test-container test-container--edge-fonts">
3535
<main class="test-viewport test-viewport--mobile">
3636
<div class="test-layout">
3737

@@ -44,20 +44,20 @@
4444
<div class="mdc-notched-outline mdc-notched-outline--notched">
4545
<div class="mdc-notched-outline__leading"></div>
4646
<div class="mdc-notched-outline__notch">
47-
<label for="outlined-text-field" class="mdc-floating-label mdc-floating-label--float-above">Label</label>
47+
<label for="outlined-text-field" class="mdc-floating-label mdc-floating-label--float-above test-font--redact-all">Label</label>
4848
</div>
4949
<div class="mdc-notched-outline__trailing"></div>
5050
</div>
5151
</div>
5252
</div>
5353

54-
<div class="test-cell test-cell--textfield" style="text-align: center;">
54+
<div class="test-cell test-cell--textarea" style="text-align: center;">
5555
<div class="mdc-text-field mdc-text-field--textarea">
56-
<textarea id="textarea" class="mdc-text-field__input" rows="8" cols="40"></textarea>
56+
<textarea id="textarea" class="mdc-text-field__input" rows="2" cols="40"></textarea>
5757
<div class="mdc-notched-outline">
5858
<div class="mdc-notched-outline__leading"></div>
5959
<div class="mdc-notched-outline__notch">
60-
<label for="textarea" class="mdc-floating-label">Textarea Label</label>
60+
<label for="textarea" class="mdc-floating-label test-font--redact-all">Textarea Label</label>
6161
</div>
6262
<div class="mdc-notched-outline__trailing"></div>
6363
</div>

0 commit comments

Comments
 (0)