diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html index 4ab42840..077c61fc 100644 --- a/contact-us/contact-us.component.html +++ b/contact-us/contact-us.component.html @@ -1,9 +1,8 @@

{{formTitle}}

-
+
@@ -48,22 +47,26 @@ [class.uk-form-danger]="contactForm.get('message').invalid && contactForm.get('message').touched">
-
+
-
- +
+
-
- -
+ + +
+
diff --git a/contact-us/contact-us.component.ts b/contact-us/contact-us.component.ts index 04e05047..19c1a9dc 100644 --- a/contact-us/contact-us.component.ts +++ b/contact-us/contact-us.component.ts @@ -13,9 +13,9 @@ export class ContactUsComponent { @Input() public formTitle: string; @Input() public organizationTypes: string[]; @Input() public buttonClass: string; - @Input() public alignButton: "left" | "right" | "center" = "left"; @Input() public sendButton: string = "Send"; @Input() public smallForm: boolean = false; + @Input() public scrollspy: boolean = false; @Input() public sending: boolean = false; @Output() sendEmitter: EventEmitter = new EventEmitter(); public properties: EnvProperties = properties; diff --git a/monitor/how/how.component.ts b/monitor/how/how.component.ts index 0bd51283..01f6bb69 100644 --- a/monitor/how/how.component.ts +++ b/monitor/how/how.component.ts @@ -3,9 +3,9 @@ import {Component} from "@angular/core"; @Component({ selector: 'how', template: ` -
+
-
+
@@ -13,12 +13,12 @@ import {Component} from "@angular/core"; Starting from existing
research-related data sources
-
+
-
+
@@ -28,7 +28,7 @@ import {Component} from "@angular/core";
-
+
@@ -37,7 +37,7 @@ import {Component} from "@angular/core"; Open Science Indicators
-
+
@@ -46,7 +46,7 @@ import {Component} from "@angular/core"; Collaboration Indicators
-
+
@@ -58,7 +58,7 @@ import {Component} from "@angular/core";
-
+
diff --git a/sharedComponents/quick-contact/quick-contact.component.css b/sharedComponents/quick-contact/quick-contact.component.css index 11492c4d..5834bbe3 100644 --- a/sharedComponents/quick-contact/quick-contact.component.css +++ b/sharedComponents/quick-contact/quick-contact.component.css @@ -9,7 +9,10 @@ } .uk-drop { - width: 380px; + max-height: 650px; + height: calc(80vh - 100px); + width: 500px; + max-width: 80vw; } .avatars > img { @@ -22,14 +25,3 @@ .avatars > img:nth-child(n+1) { margin-left: -5px; } - -/* hide scrollbar but allow scrolling */ -.uk-overflow-auto { - -ms-overflow-style: none; /* for Internet Explorer, Edge */ - scrollbar-width: none; /* for Firefox */ - overflow-y: scroll; -} - -.uk-overflow-auto::-webkit-scrollbar { - display: none; /* for Chrome, Safari, and Opera */ -} diff --git a/sharedComponents/quick-contact/quick-contact.component.html b/sharedComponents/quick-contact/quick-contact.component.html index 7f133589..f4427ac7 100644 --- a/sharedComponents/quick-contact/quick-contact.component.html +++ b/sharedComponents/quick-contact/quick-contact.component.html @@ -4,7 +4,7 @@ Contact -
+
Send a message @@ -22,10 +22,10 @@ We usually respond in a few hours.
-
+
+ [smallForm]="true" sendButton="Send Message" [contactForm]="contactForm">
diff --git a/utils/section-scroll/section-scroll.component.css b/utils/section-scroll/section-scroll.component.css index 06f037e9..7fe0c763 100644 --- a/utils/section-scroll/section-scroll.component.css +++ b/utils/section-scroll/section-scroll.component.css @@ -3,7 +3,6 @@ position: sticky; top: 0; height: 100vh; - /*border: 1px solid red;*/ } [left] .imgContainer { @@ -12,26 +11,6 @@ left: 0; width: 100%; height: 70%; - /*border: 1px solid greenyellow;*/ -} - -@media (max-width: 960px) { - [left] { - height: 50vh; - } - - [left] .imgContainer { - top: 5%; - height: 80%; - } - - [left] > * { - align-items: flex-start; - } - - [scroll] > * { - align-items: flex-end; - } } [left] img { @@ -48,5 +27,23 @@ [scroll] > * { height: 60vh; - /* border: 1px solid darkorange;*/ +} + +@media (max-width: 960px) { + [left] { + height: 50vh; + } + + [left] .imgContainer { + top: 5%; + height: 100%; + } + + [left] > * { + align-items: flex-start; + } + + [scroll] > * { + height: 50vh; + } } diff --git a/utils/section-scroll/section-scroll.component.ts b/utils/section-scroll/section-scroll.component.ts index 85e6a2f4..f80b1041 100644 --- a/utils/section-scroll/section-scroll.component.ts +++ b/utils/section-scroll/section-scroll.component.ts @@ -77,11 +77,14 @@ export class SectionScrollComponent implements AfterViewInit { entries.forEach((entry) => { entry.target['style'].opacity = String(entry.intersectionRatio); let id = this.map.get(entry.target.id); - if (this.left.has(id) && this.lastElementId !== id) { + if (this.left.has(id)) { + let element = this.left.get(id).parentElement; + if(this.lastElementId !== id || Number.parseFloat(element.style.opacity) < 1) { + this.left.get(id).parentElement.style.opacity = String(entry.intersectionRatio); + } if(entry.isIntersecting) { this.lastElementId = id; } - this.left.get(id).parentElement.style.opacity = String(entry.intersectionRatio); } }); }, options);