From 1fa40b66b79e28d9b934463b6373372129e32811 Mon Sep 17 00:00:00 2001 From: Jeferson Estevo Date: Tue, 21 Feb 2017 19:15:45 -0300 Subject: [PATCH 1/3] bug(md-slide-toggle): slide toggle should fit to it's content width Fixes #3230 --- src/lib/slide-toggle/slide-toggle.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss index 54f4dc102bf1..18bc82089c9e 100644 --- a/src/lib/slide-toggle/slide-toggle.scss +++ b/src/lib/slide-toggle/slide-toggle.scss @@ -14,7 +14,7 @@ $mat-slide-toggle-ripple-radius: 23px !default; .mat-slide-toggle { - display: flex; + display: inline-block; height: $mat-slide-toggle-height; margin: $mat-slide-toggle-margin 0; From 6593d75c60dfb1bb0c48ecc78e39ef0a212bea5e Mon Sep 17 00:00:00 2001 From: Jeferson Estevo Date: Tue, 21 Feb 2017 20:42:14 -0300 Subject: [PATCH 2/3] md-slide-toggle: show each slide toggle on it's own row on demo-app --- src/demo-app/slide-toggle/slide-toggle-demo.html | 2 +- src/demo-app/slide-toggle/slide-toggle-demo.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.html b/src/demo-app/slide-toggle/slide-toggle-demo.html index 03a1c71a03f0..609c56444b7f 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.html +++ b/src/demo-app/slide-toggle/slide-toggle-demo.html @@ -1,4 +1,4 @@ -
+
Default Slide Toggle diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.scss b/src/demo-app/slide-toggle/slide-toggle-demo.scss index e69de29bb2d1..decc330d8d90 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.scss +++ b/src/demo-app/slide-toggle/slide-toggle-demo.scss @@ -0,0 +1,8 @@ +.slide-toggle-example { + display:flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: flex-start; + align-content: flex-start; + align-items: flex-start; +} \ No newline at end of file From ea6cb12b7ed5f40f974dc692f1dc52acf3576f6a Mon Sep 17 00:00:00 2001 From: Jeferson Estevo Date: Mon, 13 Mar 2017 14:57:53 -0300 Subject: [PATCH 3/3] fix to slide toggle css (demo) --- src/demo-app/slide-toggle/slide-toggle-demo.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.scss b/src/demo-app/slide-toggle/slide-toggle-demo.scss index decc330d8d90..167b6e7239ff 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.scss +++ b/src/demo-app/slide-toggle/slide-toggle-demo.scss @@ -1,8 +1,5 @@ .slide-toggle-example { - display:flex; + display: flex; flex-direction: column; - flex-wrap: wrap; - justify-content: flex-start; - align-content: flex-start; align-items: flex-start; } \ No newline at end of file