fix(list): focus covers whole row, IE11 layout fix

Closes #2222. Closes #2240.
angular · Apr 10, 2015 · b47a878 · b47a878
1 parent 2c57a82
commit b47a878
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/src/components/list/demoBasicUsage/style.css b/src/components/list/demoBasicUsage/style.css
diff --git a/src/components/list/demoListControls/index.html b/src/components/list/demoListControls/index.html
@@ -8,7 +8,7 @@
   <md-list-item ng-click="navigateTo(setting.extraScreen)" ng-repeat="setting in settings">
     <md-icon md-svg-icon="{{setting.icon}}"></md-icon>
     <p> {{ setting.name }} </p>
-    <md-switch class="md-secondary" ng-model="setting.enabled">
+    <md-switch class="md-secondary" ng-model="setting.enabled"></md-switch>
   </md-list-item>
   <md-list-item ng-click="navigateTo('data usage')">
     <md-icon md-svg-icon="cached"></md-icon>

diff --git a/src/components/list/demoListControls/style.css b/src/components/list/demoListControls/style.css
diff --git a/src/components/list/list-theme.scss b/src/components/list/list-theme.scss
@@ -24,4 +24,7 @@ md-list.md-THEME_NAME-theme {
       }
     }
   }
+  md-list-item button {
+    background-color: '{{background-color}}';
+  }
 }
diff --git a/src/components/list/list.scss b/src/components/list/list.scss
@@ -48,7 +48,7 @@ md-list-item {
     }
   }
   &.md-with-secondary {
-    padding-right: $list-item-padding-horizontal;
+    position: relative;
   }
   &.md-clickable:hover {
     cursor: pointer;
@@ -126,16 +126,15 @@ md-list-item, md-list-item .md-list-item-inner {
     box-sizing: content-box;
   }
 
-  md-checkbox.md-secondary {
-    margin-right: 0px;
-  }
+  md-checkbox.md-secondary,
   md-switch.md-secondary {
-    margin: 0;
-    position: relative;
-    right: -9px;
+    margin-right: 0px;
   }
   .md-secondary {
     margin-left: $list-item-secondary-left-margin;
+    position: absolute;
+    right: $list-item-padding-horizontal;
+    top: 0;
   }
 
   & > p, & > .md-list-item-inner > p {