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

Bugfix/marp 692 feedback anais 3 adjustments for footer #41

Merged
merged 5 commits into from
Jul 19, 2024
Merged

Bugfix/marp 692 feedback anais 3 adjustments for footer #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d65ef68
handle css
ntqdinh-axonivy Jul 18, 2024
f574f98
update ui
ntqdinh-axonivy Jul 19, 2024
b58934e
Merge branch 'develop' into bugfix/MARP-692-Feedback-Anais-3-Adjustme…
ntqdinh-axonivy Jul 19, 2024
5ca5dac
update translating
ntqdinh-axonivy Jul 19, 2024
f0fbff3
Merge branch 'develop' into bugfix/MARP-692-Feedback-Anais-3-Adjustme…
ntqdinh-axonivy Jul 19, 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
4 changes: 2 additions & 2 deletions marketplace-ui/src/app/shared/components/footer/footer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
</section>
<!-- Section: Policy & Social Media -->
<section
class="d-flex flex-lg-row flex-column justify-content-between py-4 border-bottom">
class="d-flex flex-lg-row flex-column justify-content-between py-4">
<div class="navbar navbar-expand-xl align-self-md-center w-md-100">
<!-- Left -->
<div
class="flex-row navbar-nav me-auto mb-lg-0 flex-wrap w-md-100 justify-content-center text-center footer__ivy-policy">
@for (link of ivyFooterLinks; track $index) {
<div class="link--left" [class]="link.containerStyleClass">
<a class="nav-link text-secondary" aria-current="page">
<a class="nav-link text-secondary h5-text" aria-current="page">
{{ link.label | translate }}
</a>
</div>
Expand Down
11 changes: 11 additions & 0 deletions marketplace-ui/src/app/shared/components/footer/footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@
margin: 0 2rem 0 0;
}

.h5-text {
font-weight: 400;
font-size: 16px;
}

.btn-secondary {
padding: 8px 12px;
border-radius: 7px;
border: 0.5px solid var(--header-border-color);
}

@media all and (max-width: 990px) {
.link--left {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions marketplace-ui/src/assets/i18n/de.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ common:
download: Download
footer:
newVersionsInfo: Neue Version verfügbar für Linux,<br /> Windows und MacOS Betriebssysteme.
downloadLatestLTSVersion: Herunterladen V10.0.18
downloadLatestDevVersion: Herunterladen V11.2.1
downloadLatestLTSVersion: Download V10.0.18
downloadLatestDevVersion: Download V11.2.1
ivyCompanyInfo: © 2023 Axon Ivy Inc
privacyPolicy: Datenschutzrichtlinie
termsOfService: Nutzungsbedingungen
Expand Down
Loading