Merge remote-tracking branch 'origin/angular-12' into angular-13

This commit is contained in:
Konstantina Galouni 2022-10-05 18:06:16 +03:00
commit 6bfdd5df80
2 changed files with 8 additions and 10 deletions

View File

@ -1,6 +1,4 @@
@funder-color: #3C9F94;
@ri-color: #D023AE;
@organization-color: #E28B6C;
@import (reference) "~src/assets/openaire-theme/less/color.less";
.setType(@color) {
border-bottom: 4px solid fade(@color, 30%);

View File

@ -53,13 +53,13 @@
</div>
<div id="js-sticky-parallax-images-all" style="min-height: 300vh">
<div class="uk-visible@m uk-height-viewport monitor-dark-logo-background uk-sticky" uk-sticky="bottom: #js-sticky-parallax-images-all; target-offset: true">
<div class="uk-grid uk-child-width-1-2" uk-grid>
<div>
<div class="uk-grid" uk-grid style="height: 100vh;">
<div class="uk-width-expand uk-first-column uk-position-relative uk-height-1-1">
<div class="monitor-dark-logo-background"><!-- uk-sticky="bottom: #js-sticky-parallax-images-all; target-offset: true"-->
<div uk-parallax="target: #js-sticky-parallax-images-all;"> <!-- y: 55vh, 45vh; -->
<img class="uk-position-center-left" src="assets/monitor-assets/home/ipad.png" alt="ipad" loading="lazy"
<img class="uk-position-center" src="assets/monitor-assets/home/ipad.png" alt="ipad" loading="lazy"
uk-parallax="target: #js-sticky-parallax-images-all; start: 100vh; opacity: 1; easing:0"
style="height: 70vh">
style="height: 75vh;">
<!-- <img class="uk-position-center-left" src="assets/monitor-assets/home/ipad.png" width="1800" height="1200" alt=""-->
<!-- uk-parallax="target: #js-sticky-parallax-images-all; start: 100vh; end: 100% + 100vh - 160vh; opacity: 1,1 99%,0; easing:0">-->
<!-- <img class="uk-position-center-left" src="assets/monitor-assets/home/monitor.jpg" width="1800" height="1200" alt=""-->
@ -69,8 +69,8 @@
</div>
</div>
</div>
<div class="uk-inline uk-flex">
<div class="uk-width-3-4@l uk-width-1-1"><!-- uk-sticky="bottom: #js-sticky-parallax-images-all"-->
<div class="uk-inline uk-width-expand uk-height-1-1">
<div><!-- uk-sticky="bottom: #js-sticky-parallax-images-all"-->
<div uk-parallax="target: #js-sticky-parallax-images-all; y: 55vh, 45vh;">
<ng-container *ngTemplateOutlet="scrolling_text; context: {position_class: 'uk-position-center-left'}"></ng-container>
</div>