diff --git a/src/components/list/demoBasicUsage/index.html b/src/components/list/demoBasicUsage/index.html index acb97477fc..4870ad3b30 100644 --- a/src/components/list/demoBasicUsage/index.html +++ b/src/components/list/demoBasicUsage/index.html @@ -1,4 +1,4 @@ -
+
@@ -35,9 +35,8 @@

{{ todos[0].who }}

{{ todos[0].who }}

- Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. - Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum - velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Nam massa quam. Nulla metus metus, ullamcorper vel, tincidunt sed.

@@ -46,9 +45,8 @@

{{ todos[0].who }}

{{ todos[1].who }}

- Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. - Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum - velit. Class aptent taciti sociosqu ad litra torquent per conubia nostra, per inceptos himenaeos. + Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Nam massa quam. Nulla metus metus, ullamcorper vel, tincidunt sed.

@@ -108,9 +106,9 @@

{{ todos[0].who }}

{{ todos[0].who }}

- Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. - Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum - velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa + quam. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque + volutpat condimentum velit.

@@ -119,9 +117,9 @@

{{ todos[0].who }}

{{ todos[1].who }}

- Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. - Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum - velit. Class aptent taciti sociosqu ad litra torquent per conubia nostra, per inceptos himenaeos. + Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa + quam. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque + volutpat condimentum velit.

diff --git a/src/components/list/demoBasicUsage/script.js b/src/components/list/demoBasicUsage/script.js index 0973ba271f..df5822294d 100644 --- a/src/components/list/demoBasicUsage/script.js +++ b/src/components/list/demoBasicUsage/script.js @@ -42,10 +42,10 @@ angular.module('listDemo1', ['ngMaterial']) $scope.todos = [ { face : imagePath, - what: 'Brunch this weekend?', - who: 'Min Li Chan', + what: 'My quirky, joyful porg', + who: 'Kaguya w/ #qjporg', when: '3:08PM', - notes: " I'll be in your neighborhood doing errands" + notes: " I was lucky to find a quirky, joyful porg!" }, { face : imagePath, diff --git a/src/components/list/demoBasicUsage/style.css b/src/components/list/demoBasicUsage/style.css index a443e1dff9..8ea49e2c68 100644 --- a/src/components/list/demoBasicUsage/style.css +++ b/src/components/list/demoBasicUsage/style.css @@ -1,5 +1,4 @@ md-divider { - margin-top: 10px; - margin-bottom: 0; + margin-top: 10px; + margin-bottom: 0; } - diff --git a/src/components/list/list.scss b/src/components/list/list.scss index 3ec6d65888..bcb5abac59 100644 --- a/src/components/list/list.scss +++ b/src/components/list/list.scss @@ -1,6 +1,6 @@ $dense-baseline-grid: $baseline-grid / 2 !default; -$list-h3-margin: 0 0 0px 0 !default; +$list-h3-margin: 0 0 0 0 !default; $list-h4-margin: 3px 0 1px 0 !default; $list-h4-font-weight: 400 !default; $list-header-line-height: 1.2em !default; @@ -56,7 +56,7 @@ md-list { @include ie11-min-height-flexbug($list-item-dense-height); - // Layout for controls in primary or secondary divs, or auto-infered first child + // Layout for controls in primary or secondary divs, or auto-inferred first child md-icon:first-child { width: $list-item-dense-primary-icon-width; @@ -89,6 +89,7 @@ md-list { p { line-height: $list-item-dense-line-height; font-size: $list-item-dense-font-size; + padding-bottom: 4px; } h3 {