From b5a0bdc46a2c2c45f9dc5b19e6f2879ced4137b3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 17 Jan 2017 15:57:01 +0100
Subject: [PATCH 1/2] fix(slider): hide ticks when slider is disabled

* No longer shows the ticks on hover, when the slider is disabled.
---
 src/demo-app/slider/slider-demo.html | 2 +-
 src/lib/slider/slider.scss           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/demo-app/slider/slider-demo.html b/src/demo-app/slider/slider-demo.html
index ed85b1700d1f..88eab53625d9 100644
--- a/src/demo-app/slider/slider-demo.html
+++ b/src/demo-app/slider/slider-demo.html
@@ -9,7 +9,7 @@ <h1>Slider with Min and Max</h1>
 <input [(ngModel)]="max">
 
 <h1>Disabled Slider</h1>
-<md-slider disabled [(ngModel)]="disabledValue"></md-slider>
+<md-slider disabled [(ngModel)]="disabledValue" [tickInterval]="1"></md-slider>
 <input [(ngModel)]="disabledValue">
 
 <h1>Slider with set value</h1>
diff --git a/src/lib/slider/slider.scss b/src/lib/slider/slider.scss
index 0e20e653e06e..aab60b95be95 100644
--- a/src/lib/slider/slider.scss
+++ b/src/lib/slider/slider.scss
@@ -127,8 +127,9 @@ md-slider {
 }
 
 
-// Slider with ticks.
-.md-slider-has-ticks {
+// Slider with ticks when not disabled.
+.md-slider-has-ticks:not(.md-slider-disabled) {
+
   .md-slider-wrapper::after {
     content: '';
     position: absolute;

From 1baf989795eeb6edea8358572fa48ab2352d51aa Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 19 Jan 2017 21:16:12 +0100
Subject: [PATCH 2/2] Address feedback

---
 src/lib/slider/slider.scss | 7 ++++++-
 src/lib/slider/slider.ts   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/slider/slider.scss b/src/lib/slider/slider.scss
index aab60b95be95..d8645b867521 100644
--- a/src/lib/slider/slider.scss
+++ b/src/lib/slider/slider.scss
@@ -72,6 +72,11 @@ md-slider {
   transition: opacity $swift-ease-out-duration $swift-ease-out-timing-function;
 }
 
+// TODO(mmalerba): Simplify css to avoid unnecessary selectors.
+.md-slider-disabled .md-slider-ticks {
+  opacity: 0;
+}
+
 .md-slider-thumb-container {
   position: absolute;
   z-index: 1;
@@ -128,7 +133,7 @@ md-slider {
 
 
 // Slider with ticks when not disabled.
-.md-slider-has-ticks:not(.md-slider-disabled) {
+.md-slider-has-ticks {
 
   .md-slider-wrapper::after {
     content: '';
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 45935eccf562..36cb4bba2736 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -94,7 +94,7 @@ export class MdSliderChange {
     '[class.md-slider-thumb-label-showing]': 'thumbLabel',
     '[class.md-slider-vertical]': 'vertical',
     '[class.md-slider-min-value]': '_isMinValue',
-    '[class.md-slider-hide-last-tick]': '_isMinValue && _thumbGap && invertAxis',
+    '[class.md-slider-hide-last-tick]': '_isMinValue && _thumbGap && invertAxis || disabled',
   },
   templateUrl: 'slider.html',
   styleUrls: ['slider.css'],