Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/MARP-696-Feedback-Anais-7-Size-of-…
Browse files Browse the repository at this point in the history
…Stars
  • Loading branch information
ntqdinh-axonivy authored Jul 19, 2024
2 parents 07c4653 + 88b886f commit 0001401
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="container">
<div class="row col-md-12 mt-5">
<div class="row col-md-12 mt-8">
<h1 class="text-primary">
{{ translateService.get('common.branch') | async }}
</h1>
Expand Down
4 changes: 4 additions & 0 deletions marketplace-ui/src/app/modules/product/product.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.product-container {
min-height: 6em;
}

.mt-8{
margin-top: 8rem;
}
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@

.language-item.inactive {
color: #757575;
font-weight: 400;
}
4 changes: 2 additions & 2 deletions marketplace-ui/src/assets/i18n/de.yaml
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

0 comments on commit 0001401

Please sign in to comment.