Skip to content

Commit ee5f970

Browse files
committed
Merge branch 'uswds3.3' of https://github.com/GSA/sam-styles into uswds3.3
2 parents 034b710 + 1a10c8f commit ee5f970

3 files changed

Lines changed: 20 additions & 21 deletions

File tree

src/packages/components/alerts/alert.stories.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
class: {type: "string"},
1313
//role: {type: "string"},
1414
//title: {type: "string"},
15-
//text: {type: "string"},
15+
text: {type: "string"},
1616
},
1717
};
1818

@@ -21,60 +21,60 @@ export const __namedExportsOrder = ['Default','Expanded', 'Header', 'Sticky', 'D
2121
const AlertTemplate = (args) => {
2222
return `
2323
<h3>SDS Alert Default</h3>
24-
<div class="sds-alert--default info ${args.class}">
24+
<div class="sds-alert info ${args.class}">
2525
<div class="grid-container width-full maxw-full margin-0 padding-0">
2626
<div class="grid-row">
2727
<div class="grid-col-auto">
2828
<i class="sds bi-info-circle size-2x"></i>
2929
</div>
3030
<div class="grid-col-fill">
31-
<span class="sds-alert--default-content">
32-
<b>Less important than Global Alerts</b> Consectetur adipiscing elit, sed do eiusmod tempor indididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
31+
<span class="sds-alert-content">
32+
<b>Less important than Global Alerts</b></br>${args.text}
3333
</span>
3434
</div>
3535
</div>
3636
</div>
3737
</div>
3838
39-
<div class="sds-alert--default ${args.class}">
39+
<div class="sds-alert ${args.class}">
4040
<div class="grid-container width-full maxw-full margin-0 padding-0">
4141
<div class="grid-row">
4242
<div class="grid-col-auto">
4343
<i class="sds bi-exclamation-triangle size-2x"></i>
4444
</div>
4545
<div class="grid-col-fill">
46-
<span class="sds-alert--default-content">
47-
<b>Less important than Global Alerts</b> Consectetur adipiscing elit, sed do eiusmod tempor indididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
46+
<span class="sds-alert-content">
47+
<b>Less important than Global Alerts</b></br>${args.text}
4848
</span>
4949
</div>
5050
</div>
5151
</div>
5252
</div>
5353
54-
<div class="sds-alert--default error ${args.class}">
54+
<div class="sds-alert error ${args.class}">
5555
<div class="grid-container width-full maxw-full margin-0 padding-0">
5656
<div class="grid-row">
5757
<div class="grid-col-auto">
5858
<i class="sds bi-slash-circle size-2x"></i>
5959
</div>
6060
<div class="grid-col-fill">
61-
<span class="sds-alert--default-content">
62-
<b>Error Alerts Lorem Ipsum</b> Consectetur adipiscing elit, sed do eiusmod tempor indididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
61+
<span class="sds-alert-content">
62+
<b>Error Alerts Lorem Ipsum</b></br>${args.text}
6363
</span>
6464
</div>
6565
</div>
6666
</div>
6767
</div>
6868
69-
<div class="sds-alert--default success ${args.class}">
69+
<div class="sds-alert success ${args.class}">
7070
<div class="grid-container width-full maxw-full margin-0 padding-0">
7171
<div class="grid-row">
7272
<div class="grid-col-auto">
7373
<i class="sds bi-check-circle size-2x"></i>
7474
</div>
7575
<div class="grid-col-fill">
76-
<span class="sds-alert--default-content">
77-
<b>Less important than Global Alerts</b> Consectetur adipiscing elit, sed do eiusmod tempor indididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
76+
<span class="sds-alert-content">
77+
<b>Less important than Global Alerts</b></br>${args.text}
7878
</span>
7979
</div>
8080
</div>
@@ -130,7 +130,7 @@ Default.args = {
130130
class: "",
131131
//role: "",
132132
//title: "",
133-
//text: 'Lorem ipsum dolor sit amet, <a class="usa-link" href="javascript:void(0);">consectetur adipiscing</a> elit, sed do eiusmod.',
133+
text: 'Consectetur adipiscing elit, sed do eiusmod tempor indididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.',
134134
};
135135

136136
/*export const Emergency = AlertTemplate.bind({});

src/packages/components/alerts/styles/alert.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//SDS ALERT
22

3-
.sds-alert {
3+
.sds-alert--deprecated {
44
@include u-padding('05');
55
@include u-radius('lg');
66
border: solid 0.1rem #fbc036;
@@ -331,7 +331,7 @@
331331
}
332332
}
333333
//ALERT-Default
334-
.sds-alert--default {
334+
.sds-alert {
335335
border: solid 0.1rem #FEBE2E;
336336
@include u-radius('lg');
337337
@include u-display('flex');
@@ -353,10 +353,9 @@
353353
margin: auto 10px;
354354
}
355355

356-
.sds-alert--default-content {
356+
.sds-alert-content {
357357
@include u-display('inline-block');
358358
margin: auto;
359-
max-width: 75%;
360359
}
361360

362361
// Alert tag - Info

src/packages/components/alerts/templates/default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<h3>SDS Alert</h3>
2-
<div class="sds-alert">
2+
<div class="sds-alert--deprecated">
33
<div class="sds-alert-icon">
44
<i class="text-ink bi bi-exclamation-lg size-lg"></i>
55
</div>
66
<span>Review Required</span>
77
</div>
88

9-
<div class="sds-alert info margin-y-4">
9+
<div class="sds-alert--deprecated info margin-y-4">
1010
<div class="sds-alert-icon">
1111
<i class="fa text-ink bi-exclamation-lg size-lg"></i>
1212
</div>
1313
<span>Review Required</span>
1414
</div>
1515

16-
<div class="sds-alert error">
16+
<div class="sds-alert--deprecated error">
1717
<div class="sds-alert-icon">
1818
<i class="fa text-ink bi-exclamation-lg size-lg"></i>
1919
</div>

0 commit comments

Comments
 (0)