Skip to content

Commit 211a8dc

Browse files
Blackbaud-SandhyaRajasabesonSandhya Adhirvuhjohnhwhite
authored
fix(components/theme): missing line height token in modern v2 (#3524)
[AB#3402805](https://dev.azure.com/blackbaud/Products/_boards/board/t/SKY%20UX%20Program/Stories?System.AssignedTo=%40me&workitem=3402805) --------- Co-authored-by: Sandhya Adhirvuh <[email protected]> Co-authored-by: John White <[email protected]>
1 parent 4769a83 commit 211a8dc

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

apps/playground/src/app/components/action-bars/summary-action-bar/summary-action-bar-modal.component.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
<sky-modal>
22
<sky-modal-header> Summary Action Bar In Modal </sky-modal-header>
3-
<sky-modal-content> Content A </sky-modal-content>
3+
<sky-modal-content>
4+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam ac tempor
5+
erat. Duis facilisis, massa vestibulum consequat semper, urna lacus
6+
sollicitudin neque, eget pulvinar mauris nulla ac sem. Maecenas at aliquam
7+
nisl. Suspendisse elementum mollis est, eu tincidunt dolor pulvinar ut.
8+
Proin nec viverra eros. Nam consectetur lectus ut pulvinar mattis. Mauris
9+
vitae porta mauris. Integer bibendum at lorem non blandit. Integer ac leo
10+
elit. Nullam accumsan tortor vitae malesuada tristique. Integer non viverra
11+
urna, sed mattis dui. Suspendisse aliquet enim scelerisque justo auctor
12+
tempor. Sed at risus rutrum, efficitur sem eu, efficitur ex. Curabitur
13+
commodo, elit et varius imperdiet, lorem risus dignissim lorem, euismod
14+
pulvinar leo est sit amet eros.
15+
</sky-modal-content>
416
<sky-modal-footer>
517
<sky-summary-action-bar [formErrors]="error">
618
<sky-summary-action-bar-actions>

libs/components/theme/src/lib/styles/themes/modern/_theme.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
);
1313
--sky-override-form-font-weight: var(--sky-font-weight-body-m);
1414
--sky-override-p-line-height: var(--sky-font-line_height-body-m);
15+
--sky-override-body-line-height: normal;
1516
}
1617

1718
@include compatMixins.sky-modern-v2-html {
1819
font-size: initial;
19-
line-height: calc(20 / 14);
2020
}
2121

2222
.sky-theme-modern {
@@ -41,6 +41,13 @@
4141
color $sky-transition-time-short;
4242
}
4343

44+
body.sky-theme-modern {
45+
line-height: var(
46+
--sky-override-body-line-height,
47+
var(--sky-font-line_height-body-m)
48+
);
49+
}
50+
4451
.sky-theme-modern {
4552
a {
4653
color: var(--sky-color-text-action);
@@ -99,7 +106,10 @@
99106
}
100107

101108
p {
102-
line-height: var(--sky-override-p-line-height);
109+
line-height: var(
110+
--sky-override-p-line-height,
111+
var(--sky-font-line_height-body-m)
112+
);
103113
}
104114

105115
mark.sky-highlight-mark {

0 commit comments

Comments
 (0)