From dce78010b35143569eb755e9905fe78d3232d6ad Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Thu, 25 Apr 2019 23:46:54 +0200
Subject: [PATCH 1/2] chore: minor prototype fixes

* Fixes an e2e test failure in the slide toggle prototype.
* Fixes the underlines not being reset in the menu item.
---
 src/material-experimental/mdc-menu/menu.scss               | 1 +
 .../mdc-slide-toggle/slide-toggle.scss                     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/material-experimental/mdc-menu/menu.scss b/src/material-experimental/mdc-menu/menu.scss
index 97cba2d5390f..f7f23179a3de 100644
--- a/src/material-experimental/mdc-menu/menu.scss
+++ b/src/material-experimental/mdc-menu/menu.scss
@@ -37,6 +37,7 @@
   color: inherit;
   font-size: inherit;
   background: none;
+  text-decoration: none;
 
   &[disabled] {
     cursor: default;
diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
index c79e938a012e..d8959b951d12 100644
--- a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
+++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
@@ -40,4 +40,11 @@
   .mat-ripple-element {
     opacity: map-get($mdc-ripple-dark-ink-opacities, press);
   }
+
+  &._mat-animation-noopable {
+    .mdc-switch__thumb-underlay,
+    .mdc-switch__thumb-underlay::before {
+      transition: none;
+    }
+  }
 }

From 39e7cd6ee79ec59b4a959b89e7d64ab0bf25fa0d Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Thu, 25 Apr 2019 15:29:09 -0700
Subject: [PATCH 2/2] add comment for CSS override

---
 src/material-experimental/mdc-slide-toggle/slide-toggle.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
index d8959b951d12..ebe24aad40ef 100644
--- a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
+++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss
@@ -41,6 +41,9 @@
     opacity: map-get($mdc-ripple-dark-ink-opacities, press);
   }
 
+  // Angular Material supports disabling all animations when NoopAnimationsModule is imported.
+  // TODO(mmalerba): Look into using MDC's Sass queries to separate the animation styles and
+  //  conditionally add them. Consider the size cost when deciding whether to switch.
   &._mat-animation-noopable {
     .mdc-switch__thumb-underlay,
     .mdc-switch__thumb-underlay::before {