Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/MARP-692-Feedback-Anais-3-Adjustme…
Browse files Browse the repository at this point in the history
…nts-for-footer
  • Loading branch information
ntqdinh-axonivy authored Jul 19, 2024
2 parents 5ca5dac + b5f0afc commit f0fbff3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 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;
}
2 changes: 1 addition & 1 deletion marketplace-ui/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ export const environment = {
production: true,
apiUrl: 'http://10.193.8.78:9090/marketplace-service',
githubClientId: 'Ov23liVMliBxBqdQ7FnG',
githubAuthCallbackUrl: 'http://10.193.8.78:4200/auth/github/callback',
githubAuthCallbackUrl: 'http://marketplace.server.ivy-cloud.com:4200/auth/github/callback',
dayInMiliseconds: 86400000
};

0 comments on commit f0fbff3

Please sign in to comment.