Skip to content

387242169: (fix) change availability of certificate page #1045

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

Merged
OlgaMardvilko merged 1 commit into from
Jan 3, 2025
Merged

387242169: (fix) change availability of certificate page #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions modules/ui/src/app/pages/certificates/certificates.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
}

.content-certificates {
margin: 8px 24px;
border-bottom: 1px solid colors.$outline-variant;
margin: 2px 18px 0;
overflow-y: scroll;
height: max-content;
max-height: calc(100vh - 344px);
max-height: calc(
100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
);
padding: 0 6px 6px;
}

.certificates-button-container {
Expand Down
8 changes: 7 additions & 1 deletion ...rc/app/pages/certificates/components/certificates-table/certificates-table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
row-item-outline-color: colors.$outline-variant,
)
);

::ng-deep .mdc-data-table__row:last-child .mat-mdc-cell {
border-bottom: 1px solid colors.$outline-variant;
}
}

::ng-deep .delete-certificate app-simple-dialog {
Expand Down Expand Up @@ -94,7 +98,9 @@
}

.certificates-content-empty {
height: calc(100vh - 344px);
height: calc(
100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
);
}

.empty-data-cell {
Expand Down
84 changes: 84 additions & 0 deletions modules/ui/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,40 @@ body #main {
.setting-drawer-content {
max-height: calc(100vh - #{variables.$settings-top-with-callout});
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height}
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height}
);
}
}

&:has(.app-callout-container > app-callout + app-callout) {
.setting-drawer-content {
max-height: calc(100vh - #{variables.$settings-top-with-two-callouts});
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height}
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height}
);
}
}
}

Expand All @@ -403,6 +431,20 @@ body #main {
100vh - #{variables.$settings-top-with-callout} - 20px
);
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height} - 20px
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height} - 20px
);
}
}

&:has(
Expand All @@ -415,6 +457,20 @@ body #main {
100vh - #{variables.$settings-top-with-two-callouts} - 20px
);
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height} - 20px
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height} - 20px
);
}
}
}
}
Expand All @@ -427,6 +483,20 @@ body #main {
100vh - #{variables.$settings-top-with-callout} - 20px
);
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height} - 20px
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-callout} -
#{variables.$certificate-button-height} - 20px
);
}
}

&:has(.app-callout-container > app-callout + app-callout) {
Expand All @@ -435,6 +505,20 @@ body #main {
100vh - #{variables.$settings-top-with-two-callouts} - 40px
);
}

.content-certificates {
max-height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height} - 40px
);
}

.certificates-content-empty {
height: calc(
100vh - #{variables.$settings-top-with-two-callouts} -
#{variables.$certificate-button-height} - 40px
);
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions modules/ui/src/theming/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $reports-table-header-size: 32px;
$settings-top: 260px;
$settings-top-with-callout: 340px;
$settings-top-with-two-callouts: 410px;
$certificate-button-height: 90px;

// nav variables
$nav-button-height: 32px;
Expand Down
Loading