Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(list): dense lists cut off descenders of letters like gjqpy #11806

Merged
Splaktar merged 1 commit into from
Mar 5, 2020
Merged

fix(list): dense lists cut off descenders of letters like gjqpy #11806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/components/list/demoBasicUsage/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-controller="AppCtrl" ng-cloak layout-gt-sm="row" layout="column">
<div ng-controller="AppCtrl" ng-cloak layout-gt-sm="row">

<div flex-gt-sm="50" flex>

Expand Down Expand Up @@ -35,9 +35,8 @@ <h3>{{ todos[0].who }}</h3>
<div class="md-list-item-text">
<h3>{{ todos[0].who }}</h3>
<p>
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.
</p>
</div>
</md-list-item>
Expand All @@ -46,9 +45,8 @@ <h3>{{ todos[0].who }}</h3>
<div class="md-list-item-text">
<h3>{{ todos[1].who }}</h3>
<p>
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.
</p>
</div>
</md-list-item>
Expand Down Expand Up @@ -108,9 +106,9 @@ <h3>{{ todos[0].who }}</h3>
<div class="md-list-item-text">
<h3>{{ todos[0].who }}</h3>
<p>
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.
</p>
</div>
</md-list-item>
Expand All @@ -119,9 +117,9 @@ <h3>{{ todos[0].who }}</h3>
<div class="md-list-item-text">
<h3>{{ todos[1].who }}</h3>
<p>
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.
</p>
</div>
</md-list-item>
Expand Down
6 changes: 3 additions & 3 deletions src/components/list/demoBasicUsage/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions src/components/list/demoBasicUsage/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
md-divider {
margin-top: 10px;
margin-bottom: 0;
margin-top: 10px;
margin-bottom: 0;
}

5 changes: 3 additions & 2 deletions src/components/list/list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down