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

(fix) O3-2870: Form navigation fixes for RTL languages #124

Merged
merged 2 commits into from
Feb 19, 2024
Merged

(fix) O3-2870: Form navigation fixes for RTL languages #124

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
33382ad
(fix) O3-2870: Form navigation fixes
Feb 15, 2024
ff1d5dd
(fix) O3-2870: Quickfix for nav button vertical alignmet
Feb 15, 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
2 changes: 1 addition & 1 deletion projects/ngx-formentry/src/components/ngx-tabset/components/ngx-tab-set.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,5 @@

.tab-container {
display: grid;
grid-template-columns: 179px auto;
grid-template-columns: 179px minmax(0, 1fr);
}
2 changes: 1 addition & 1 deletion projects/ngx-formentry/src/components/ngx-tabset/components/tab.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
h4 {
padding-left: 1rem;
padding-inline-start: 1rem;
margin-bottom: 0.5rem;
}

Expand Down
14 changes: 10 additions & 4 deletions projects/ngx-formentry/src/form-entry/form-renderer/form-renderer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,21 @@

<!-- Buttons for navigating between tabs -->
<section *ngIf="this.hasMultiplePages">
<div class="cds--btn-set button-set">
<div class="button-set">
<button
class="cds--btn cds--btn--ghost nav-button"
[disabled]="i === 0"
type="button"
>
<a *ngIf="i > 0" (click)="tabSelected(i - 1)" class="nav-link">
<a
*ngIf="i > 0"
(click)="tabSelected(i - 1)"
class="nav-link"
[title]='node.question.questions[i - 1].label | translate'
>
<label class="nav-label">{{ 'previous' | translate }}</label>
<span class="nav-link-text">{{
node.question.questions[i - 1].label
node.question.questions[i - 1].label | translate
}}</span>
</a>
</button>
Expand All @@ -41,10 +46,11 @@
*ngIf="i < node.question.questions.length - 1"
(click)="tabSelected(i + 1)"
class="nav-link"
[title]='node.question.questions[i + 1].label | translate'
>
<label class="nav-label">{{ 'next' | translate }}</label>
<span class="nav-link-text">{{
node.question.questions[i + 1].label
node.question.questions[i + 1].label | translate
}}</span>
</a>
</button>
Expand Down
11 changes: 8 additions & 3 deletions projects/ngx-formentry/src/form-entry/form-renderer/form-renderer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '@carbon/styles/scss/type';
@use '@carbon/styles/scss/spacing';

.button-set {
margin-top: 1rem;
Expand All @@ -9,19 +10,23 @@
height: 5rem;
max-width: 50%;
min-width: 50%;
padding-block: 0.25rem;
padding-block: spacing.$spacing-02;
align-items: center;
}

.nav-link {
min-width: 100%;
display: flex;
align-content: flex-start;
align-items: baseline;
align-items: flex-start;
flex-direction: column;
}

.nav-link-text {
margin-top: 0.125rem;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: calc(100% - #{spacing.$spacing-02});
@include type.type-style('heading-03');
}

Expand Down
Loading