Skip to content

Commit a551af7

Browse files
authored
Merge pull request #158 from ASU/UDS-468-Accordions---Icon-and-color-variations
Uds 468 accordions icon and color variations
2 parents 1f85cc7 + b113fa5 commit a551af7

File tree

2 files changed

+224
-22
lines changed

2 files changed

+224
-22
lines changed

packages/bootstrap4-theme/src/scss/extends/_cards.scss

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Cards - Table of Contents
1515
margin-bottom: -32px;
1616
}
1717

18-
.row-spaced>.col,
19-
.row-spaced>div {
18+
.row-spaced > .col,
19+
.row-spaced > div {
2020
margin-bottom: 32px;
2121
}
2222

@@ -46,15 +46,15 @@ Cards - Table of Contents
4646
box-shadow: 0 0 8px #00baff !important;
4747
}
4848

49-
.card-hover>button {
49+
.card-hover > button {
5050
border: none;
5151
background: transparent;
5252
text-align: inherit;
5353
margin: 0;
5454
padding: 0;
5555
}
5656

57-
.card-hover>button:focus {
57+
.card-hover > button:focus {
5858
outline: 0;
5959
box-shadow: 0 0 8px #00baff !important;
6060
border: 0;
@@ -107,7 +107,7 @@ Cards - Table of Contents
107107
padding: 0 32px 24px 32px;
108108
}
109109

110-
.card>div:last-child {
110+
.card > div:last-child {
111111
padding-bottom: 32px;
112112
}
113113

@@ -152,18 +152,18 @@ Cards - Table of Contents
152152

153153
.card-button .btn {
154154
font-size: $uds-component-button-small-font-size;
155-
padding: $uds-component-button-padding-y-small $uds-component-button-padding-x-small;
155+
padding: $uds-component-button-padding-y-small
156+
$uds-component-button-padding-x-small;
156157
line-height: 1rem;
157158
}
158159

159-
.card>div:last-child {
160+
.card > div:last-child {
160161
padding-bottom: 24px;
161162
}
162163
}
163164

164165
@include media-breakpoint-up(lg) {
165166
.col-lg-6 .card {
166-
167167
.card-img-top img,
168168
.card-img-top {
169169
height: 240px;
@@ -218,7 +218,6 @@ Cards - Table of Contents
218218
}
219219

220220
.card-lg {
221-
222221
.card-img-top img,
223222
.card-img-top {
224223
height: $uds-component-card-basic-image-top-height-lg;
@@ -336,7 +335,6 @@ Cards - Table of Contents
336335
}
337336

338337
.card-story.card-horizontal {
339-
340338
.card-header,
341339
.card-body,
342340
.card-button,
@@ -366,15 +364,15 @@ Cards - Table of Contents
366364
font-size: 14px;
367365
}
368366

369-
.card-event-details>div:first-child {
367+
.card-event-details > div:first-child {
370368
margin-right: 16px;
371369
}
372370

373371
.card-event-icons {
374372
display: flex;
375373
}
376374

377-
.card-event-icons>div:first-child {
375+
.card-event-icons > div:first-child {
378376
width: 16px;
379377
margin-right: 8px;
380378
}
@@ -441,9 +439,28 @@ Cards - Table of Contents
441439
border-left: $uds-size-spacing-1 solid $uds-color-base-gold;
442440
height: auto;
443441

442+
&.card-maroon {
443+
border-left-color: $uds-color-base-maroon;
444+
}
445+
446+
&.card-gray {
447+
border-left-color: $uds-color-base-gray-4;
448+
}
449+
450+
&.card-dark {
451+
border-left-color: $uds-color-base-gray-7;
452+
}
453+
444454
.card-header {
445455
padding: $uds-size-spacing-1;
446456

457+
&.card-header-icon {
458+
& .card-icon {
459+
display: flex;
460+
margin-left: -($uds-size-spacing-3 / 2);
461+
}
462+
}
463+
447464
&:hover {
448465
background-color: $uds-color-base-gray-2;
449466
}
@@ -464,6 +481,7 @@ Cards - Table of Contents
464481
svg.fa-chevron-up {
465482
margin-left: $uds-size-spacing-3;
466483
transition-duration: $uds-time-transition-base;
484+
align-self: flex-start;
467485
}
468486

469487
&.collapsed svg.fa-chevron-up {
@@ -472,19 +490,19 @@ Cards - Table of Contents
472490
}
473491
}
474492

475-
+.card-body {
493+
+ .card-body {
476494
border-top: 1px solid $uds-color-base-gray-3;
477495
}
478496
}
479497

480498
.card-body {
481499
background-color: $uds-color-base-gray-1;
482500

483-
>p:first-child {
501+
> p:first-child {
484502
margin-top: $uds-size-spacing-2;
485503
}
486504

487-
>p:last-child {
505+
> p:last-child {
488506
margin-bottom: 0;
489507
}
490508
}
@@ -515,14 +533,14 @@ Cards - Table of Contents
515533
}
516534
}
517535

518-
.card-header+.card-body {
536+
.card-header + .card-body {
519537
border-top: 0;
520538
}
521539

522540
.card-body {
523541
background-color: transparent;
524542

525-
>p:first-child {
543+
> p:first-child {
526544
margin-top: 0;
527545
}
528546
}
@@ -576,7 +594,6 @@ Cards - Table of Contents
576594
--------------------------------------------------------------------*/
577595

578596
.uds-quicklinks {
579-
580597
display: flex;
581598
flex-direction: column;
582599

@@ -608,12 +625,11 @@ Cards - Table of Contents
608625
}
609626

610627
button[aria-expanded='true'] {
611-
612628
svg {
613629
transform: rotate(180deg);
614630
}
615631

616-
+.separator {
632+
+ .separator {
617633
display: none;
618634
}
619635
}
@@ -653,7 +669,6 @@ Cards - Table of Contents
653669
}
654670

655671
@mixin uds-quicklinks-expanded {
656-
657672
button {
658673
border-bottom: 0;
659674
font-size: 30px;
@@ -686,7 +701,6 @@ Cards - Table of Contents
686701
margin-bottom: 0;
687702
border-bottom: $uds-size-spacing-1 solid $uds-color-base-gold;
688703
}
689-
690704
}
691705

692706
.card {

0 commit comments

Comments
 (0)