From 4602d51f7d153339405ac122427b7e1cab05b543 Mon Sep 17 00:00:00 2001 From: Abhinay Omkar Date: Wed, 2 Oct 2019 14:20:46 -0400 Subject: [PATCH] fix(text-field): Fix for asterisk color and other minor changes --- packages/mdc-notched-outline/_mixins.scss | 2 +- packages/mdc-textfield/_mixins.scss | 2 -- test/screenshot/golden.json | 16 ++++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/mdc-notched-outline/_mixins.scss b/packages/mdc-notched-outline/_mixins.scss index 1a2ef6c53ae..9769e127809 100644 --- a/packages/mdc-notched-outline/_mixins.scss +++ b/packages/mdc-notched-outline/_mixins.scss @@ -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; } } diff --git a/packages/mdc-textfield/_mixins.scss b/packages/mdc-textfield/_mixins.scss index 83dd9eb67ad..3a6dd9b5289 100644 --- a/packages/mdc-textfield/_mixins.scss +++ b/packages/mdc-textfield/_mixins.scss @@ -92,7 +92,6 @@ @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) { @@ -100,7 +99,6 @@ // 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; diff --git a/test/screenshot/golden.json b/test/screenshot/golden.json index 8449f78f6b8..538b2cd6fbf 100644 --- a/test/screenshot/golden.json +++ b/test/screenshot/golden.json @@ -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": {