Skip to content

Commit

Permalink
fix(text-field): Fix for asterisk color and other minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
abhiomkar committed Oct 2, 2019
1 parent 892dd4e commit 4602d51
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion packages/mdc-notched-outline/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
///
@mixin mdc-notched-outline-notch-offset($stroke-width) {
.mdc-notched-outline--notched .mdc-notched-outline__notch {
padding-top: $stroke-width - $mdc-notched-outline-border-width;
padding-top: $stroke-width;
}
}

Expand Down
2 changes: 0 additions & 2 deletions packages/mdc-textfield/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,13 @@
@mixin mdc-text-field-height($height) {
height: $height;

// Target only dense text field.
@if $height <= 40px {
// Target only IE 11
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
.mdc-text-field__input {
// Set line-height to the height of input element excluding padding & border.
line-height:
$height
- $mdc-text-field-input-padding
- $mdc-text-field-input-padding-top
- $mdc-text-field-input-padding-bottom
- $mdc-text-field-input-border-bottom;
Expand Down
16 changes: 8 additions & 8 deletions test/screenshot/golden.json
Original file line number Diff line number Diff line change
Expand Up @@ -1840,35 +1840,35 @@
}
},
"spec/mdc-textfield/mixins/density-invalid.html": {
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density-invalid.html?utm_source=golden_json",
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-invalid.html?utm_source=golden_json",
"screenshots": {
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density-invalid.html.windows_chrome_76.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density-invalid.html.windows_firefox_69.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density-invalid.html.windows_ie_11.png"
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-invalid.html.windows_ie_11.png"
}
},
"spec/mdc-textfield/mixins/density-leading-icon-invalid.html": {
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon-invalid.html?utm_source=golden_json",
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-leading-icon-invalid.html?utm_source=golden_json",
"screenshots": {
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon-invalid.html.windows_chrome_76.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon-invalid.html.windows_firefox_69.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon-invalid.html.windows_ie_11.png"
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-leading-icon-invalid.html.windows_ie_11.png"
}
},
"spec/mdc-textfield/mixins/density-leading-icon.html": {
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon.html?utm_source=golden_json",
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-leading-icon.html?utm_source=golden_json",
"screenshots": {
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon.html.windows_chrome_76.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon.html.windows_firefox_69.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/13/19_39_26_994/spec/mdc-textfield/mixins/density-leading-icon.html.windows_ie_11.png"
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density-leading-icon.html.windows_ie_11.png"
}
},
"spec/mdc-textfield/mixins/density.html": {
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density.html?utm_source=golden_json",
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density.html?utm_source=golden_json",
"screenshots": {
"desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density.html.windows_chrome_76.png",
"desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density.html.windows_firefox_69.png",
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/09/10/22_11_48_498/spec/mdc-textfield/mixins/density.html.windows_ie_11.png"
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/abhiomkar/2019/10/02/19_16_46_900/spec/mdc-textfield/mixins/density.html.windows_ie_11.png"
}
},
"spec/mdc-textfield/mixins/outline-shape-radius.html": {
Expand Down

0 comments on commit 4602d51

Please sign in to comment.