diff --git a/src/app/header/header-slider/header-slider.component.css b/src/app/header/header-slider/header-slider.component.css index 5946178..4d7f6ec 100644 --- a/src/app/header/header-slider/header-slider.component.css +++ b/src/app/header/header-slider/header-slider.component.css @@ -2,7 +2,7 @@ background-color: #2e2e2e; width: 50%; height: 90vh; - position: absolute; + position: fixed; top: 10vh; right: 0; overflow: hidden !important; diff --git a/src/app/header/header.component.css b/src/app/header/header.component.css index fe21636..0a955e5 100644 --- a/src/app/header/header.component.css +++ b/src/app/header/header.component.css @@ -1,8 +1,3 @@ -.wrapper { - width: 100vw; - overflow: hidden; -} - .header { top: 0; left: 0; @@ -11,6 +6,7 @@ width: 100vw; background-color: #2e2e2e; + z-index: 50; height: 10vh; min-height: 80px; @@ -114,6 +110,10 @@ app-header-slider { max-width: 1333px; } + .slider-container { + display: none; + } + .nav-links { all: unset; width: 50%; diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 06dbcda..f080519 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,92 +1,90 @@ -
-
-
- - - -
-
- - Profile Picture -
- - - -
-
-
-
+
+
+ + -
-
- - +
- - -
+ + Profile Picture +
-
- - - - + +
+
+
+
+
+ + + + +
+ +
+ + + + +
+
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index d3c6a31..4f75f3f 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -5,7 +5,7 @@ import { OnDestroy, OnInit, ViewChild, - ViewContainerRef, + ViewContainerRef, ViewEncapsulation, } from '@angular/core'; import { faUser } from '@fortawesome/free-solid-svg-icons'; import { LoginComponent } from './header-popup/login/login.component'; diff --git a/src/styles.css b/src/styles.css index 0b165c2..e0431ef 100644 --- a/src/styles.css +++ b/src/styles.css @@ -6,6 +6,13 @@ margin: 0 auto; } +html, body { + width: 100vw; + overflow-y: scroll; + overflow-x: hidden; + position: absolute; +} + h1, h2, h3,