Merge branch 'main' into alert-icon-too-big

Blackbaud-SandhyaRajasabeson · web-flow · commit 4dd246e728ec · 2025-06-20T12:51:22.000-04:00
diff --git a/apps/playground/src/app/components/action-bars/summary-action-bar/summary-action-bar-modal.component.html b/apps/playground/src/app/components/action-bars/summary-action-bar/summary-action-bar-modal.component.html
@@ -1,6 +1,18 @@
 <sky-modal>
   <sky-modal-header> Summary Action Bar In Modal </sky-modal-header>
-  <sky-modal-content> Content A </sky-modal-content>
+  <sky-modal-content>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam ac tempor
+    erat. Duis facilisis, massa vestibulum consequat semper, urna lacus
+    sollicitudin neque, eget pulvinar mauris nulla ac sem. Maecenas at aliquam
+    nisl. Suspendisse elementum mollis est, eu tincidunt dolor pulvinar ut.
+    Proin nec viverra eros. Nam consectetur lectus ut pulvinar mattis. Mauris
+    vitae porta mauris. Integer bibendum at lorem non blandit. Integer ac leo
+    elit. Nullam accumsan tortor vitae malesuada tristique. Integer non viverra
+    urna, sed mattis dui. Suspendisse aliquet enim scelerisque justo auctor
+    tempor. Sed at risus rutrum, efficitur sem eu, efficitur ex. Curabitur
+    commodo, elit et varius imperdiet, lorem risus dignissim lorem, euismod
+    pulvinar leo est sit amet eros.
+  </sky-modal-content>
   <sky-modal-footer>
     <sky-summary-action-bar [formErrors]="error">
       <sky-summary-action-bar-actions>
diff --git a/libs/components/docs-tools/src/lib/modules/code-example-viewer/stackblitz.service.spec.ts b/libs/components/docs-tools/src/lib/modules/code-example-viewer/stackblitz.service.spec.ts
@@ -341,7 +341,7 @@ export class ExampleHelpService extends SkyHelpService {
       https://github.com/stackblitz/core/issues/133
     -->
     <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
-    <link rel="stylesheet" type="text/css" href="https://sky.blackbaudcdn.net/static/skyux-icons/8.0.0/assets/css/skyux-icons.min.css" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="https://sky.blackbaudcdn.net/static/skyux-icons/8.2.0/assets/css/skyux-icons.min.css" crossorigin="anonymous">
   </head>
   <body>
     <foo-example></foo-example>
diff --git a/libs/components/docs-tools/src/lib/modules/code-example-viewer/stackblitz.service.ts b/libs/components/docs-tools/src/lib/modules/code-example-viewer/stackblitz.service.ts
@@ -299,7 +299,7 @@ export class ExampleHelpService extends SkyHelpService {
       https://github.com/stackblitz/core/issues/133
     -->
     <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
-    <link rel="stylesheet" type="text/css" href="https://sky.blackbaudcdn.net/static/skyux-icons/8.0.0/assets/css/skyux-icons.min.css" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="https://sky.blackbaudcdn.net/static/skyux-icons/8.2.0/assets/css/skyux-icons.min.css" crossorigin="anonymous">
   </head>
   <body>
     <${config.componentSelector}></${config.componentSelector}>
diff --git a/libs/components/packages/package.json b/libs/components/packages/package.json
@@ -64,7 +64,7 @@
       "@skyux/help-inline": "0.0.0-PLACEHOLDER",
       "@skyux/i18n": "0.0.0-PLACEHOLDER",
       "@skyux/icon": "0.0.0-PLACEHOLDER",
-      "@skyux/icons": "^8.0.0",
+      "@skyux/icons": "^8.2.0",
       "@skyux/indicators": "0.0.0-PLACEHOLDER",
       "@skyux/inline-form": "0.0.0-PLACEHOLDER",
       "@skyux/layout": "0.0.0-PLACEHOLDER",
diff --git a/libs/components/theme/package.json b/libs/components/theme/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@blackbaud/skyux-design-tokens": "0.0.59",
-    "@skyux/icons": "8.0.0",
+    "@skyux/icons": "8.2.0",
     "fontfaceobserver": "2.3.0",
     "tslib": "^2.8.1"
   },
diff --git a/libs/components/theme/src/lib/styles/sky.scss b/libs/components/theme/src/lib/styles/sky.scss
@@ -23,4 +23,4 @@
 @forward 'type';
 
 @import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
-@import url('https://sky.blackbaudcdn.net/static/skyux-icons/8.0.0/assets/css/skyux-icons.min.css');
+@import url('https://sky.blackbaudcdn.net/static/skyux-icons/8.2.0/assets/css/skyux-icons.min.css');
diff --git a/libs/components/theme/src/lib/styles/themes/modern/_theme.scss b/libs/components/theme/src/lib/styles/themes/modern/_theme.scss
@@ -12,11 +12,11 @@
   );
   --sky-override-form-font-weight: var(--sky-font-weight-body-m);
   --sky-override-p-line-height: var(--sky-font-line_height-body-m);
+  --sky-override-body-line-height: normal;
 }
 
 @include compatMixins.sky-modern-v2-html {
   font-size: initial;
-  line-height: calc(20 / 14);
 }
 
 .sky-theme-modern {
@@ -41,6 +41,13 @@
     color $sky-transition-time-short;
 }
 
+body.sky-theme-modern {
+  line-height: var(
+    --sky-override-body-line-height,
+    var(--sky-font-line_height-body-m)
+  );
+}
+
 .sky-theme-modern {
   a {
     color: var(--sky-color-text-action);
@@ -99,7 +106,10 @@
   }
 
   p {
-    line-height: var(--sky-override-p-line-height);
+    line-height: var(
+      --sky-override-p-line-height,
+      var(--sky-font-line_height-body-m)
+    );
   }
 
   mark.sky-highlight-mark {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -102,7 +102,7 @@
     "@blackbaud/skyux-design-tokens": "0.0.59",
     "@eslint/js": "9.24.0",
     "@nx/angular": "20.5.0",
-    "@skyux/icons": "8.0.0",
+    "@skyux/icons": "8.2.0",
     "@stackblitz/sdk": "1.11.0",
     "@storybook/addon-interactions": "8.6.4",
     "ag-grid-angular": "33.2.1",
