Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(stepper): nested accordion have wrong styling and behaviour #1550

Merged
merged 2 commits into from
Sep 10, 2024
Merged

fix(stepper): nested accordion have wrong styling and behaviour #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
005ca1e
fix(stepper): nested accordion wrong height
valentin-mladenov Sep 9, 2024
72e6f98
fix(stepper): nested accordion wrong styles
valentin-mladenov Sep 9, 2024
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
60 changes: 27 additions & 33 deletions projects/angular/src/accordion/stepper/_stepper.clarity.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,33 @@

@include mixins.exports('stepper.clarity') {
.clr-stepper-forms {
&
> .clr-accordion-panel
> .clr-accordion-panel-open
> .clr-accordion-header
> .clr-accordion-header-button
> .clr-accordion-status
> .clr-accordion-number {
padding: 0 tokens.$cds-global-space-7;
display: inline-block !important;
& > .clr-accordion-panel {
& > .clr-accordion-panel-open,
& > .clr-accordion-panel-inactive,
& > .clr-accordion-panel-error,
& > .clr-accordion-panel-complete {
& > .clr-accordion-header > .clr-accordion-header-button {
align-items: center;
gap: tokens.$cds-global-space-12;
min-height: mixins.baselinePx(56);
padding: tokens.$cds-global-space-5 tokens.$cds-global-space-9 tokens.$cds-global-space-5
tokens.$cds-global-space-10;

@include mixins.generate-typography-token('BODY-14-SB-STD');

.clr-accordion-description {
@include mixins.generate-typography-token('BODY-14-RG-STD');
}

.clr-accordion-status {
min-width: tokens.$cds-global-space-14;
}

@media (max-width: accordion-variables.$clr-accordion-responsive-breakpoint) {
gap: tokens.$cds-global-space-9;
}
}
}
}

&
Expand Down Expand Up @@ -57,17 +75,6 @@
color: accordion-variables.$clr-accordion-complete-color;
}

.clr-accordion-header-button {
align-items: center;
gap: tokens.$cds-global-space-12;
min-height: mixins.baselinePx(56);
padding: tokens.$cds-global-space-5 tokens.$cds-global-space-9 tokens.$cds-global-space-5
tokens.$cds-global-space-10;
@media (max-width: accordion-variables.$clr-accordion-responsive-breakpoint) {
gap: tokens.$cds-global-space-9;
}
}

&
> .clr-accordion-panel
> .clr-accordion-panel-inactive
Expand All @@ -88,12 +95,7 @@
visibility: visible;
}

.clr-accordion-status {
min-width: tokens.$cds-global-space-14;
}

.clr-accordion-number {
@include mixins.generate-typography-token('BODY-14-SB-STD');
padding: 0 tokens.$cds-global-space-7;
display: inline-block;
}
Expand All @@ -102,14 +104,6 @@
display: inline-block;
}

.clr-accordion-title {
@include mixins.generate-typography-token('BODY-14-SB-STD');
}

.clr-accordion-description {
@include mixins.generate-typography-token('BODY-14-RG-STD');
}

.clr-step-button {
display: block;
margin-top: tokens.$cds-global-space-9;
Expand Down
3 changes: 3 additions & 0 deletions projects/demo/src/app/stepper/stepper.demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ <h2>Stepper with a nested accordion inside it</h2>
<clr-accordion>
<clr-accordion-panel>
<clr-accordion-title>Accordion 1</clr-accordion-title>
<clr-accordion-description>
The full license information can be found in LICENSE in the root directory.
</clr-accordion-description>
<clr-accordion-content>Accordion 1 content</clr-accordion-content>
</clr-accordion-panel>
</clr-accordion>
Expand Down
Loading