fix(switch): only add focus border if label is not empty

Closes #944.
angular · Dec 15, 2014 · 9c24cc9 · 9c24cc9
1 parent fcb9b2c
commit 9c24cc9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/components/switch/switch-theme.scss b/src/components/switch/switch-theme.scss
@@ -37,7 +37,7 @@ md-switch.md-#{$theme-name}-theme {
   }
 
   &:focus {
-    .md-text {
+    .md-label:not(:empty) {
       border-color: black;
       border-style: dotted;
     }

diff --git a/src/components/switch/switch.js b/src/components/switch/switch.js
@@ -59,7 +59,7 @@ function MdSwitch(mdCheckboxDirective, $mdTheming, $mdUtil, $document, $mdConsta
           '<div class="md-thumb" md-ink-ripple md-ink-ripple-checkbox></div>' +
         '</div>'+
       '</div>' +
-      '<div ng-transclude class="md-text">' +
+      '<div ng-transclude class="md-label">' +
       '</div>',
     require: '?ngModel',
     compile: compile

diff --git a/src/components/switch/switch.scss b/src/components/switch/switch.scss
@@ -16,8 +16,9 @@ md-switch {
     margin-right: 8px;
   }
 
-  .md-text {
-    border: 1px solid transparent;
+  .md-label {
+    border-color: transparent;
+    border-width: 1px;
   }
 
   .md-bar {