diff --git a/web/src/components/general/Icon.tsx b/web/src/components/general/Icon.tsx
index 8cc830c..eda7f1d 100644
--- a/web/src/components/general/Icon.tsx
+++ b/web/src/components/general/Icon.tsx
@@ -3,7 +3,7 @@ import styles from "./icon.module.scss";
export default function Icon({
type,
}: {
- type?: "doc" | "arrowUp" | "arrowRight" | "externalLink" | "tickets" | "list" | "calendar" | "filter" | "noFilter" | "instagram" | "facebook" | "flickr";
+ type?: "doc" | "arrowUp" | "arrowRight" | "externalLink" | "search" | "tickets" | "list" | "calendar" | "filter" | "noFilter" | "instagram" | "facebook" | "flickr";
}) {
return (
@@ -29,6 +29,10 @@ export default function Icon({
)}
+ {type === "search" && (
+
+ )}
+
{type === "tickets" && (
)}
diff --git a/web/src/components/layout/Header.tsx b/web/src/components/layout/Header.tsx
index 4b139f7..94925e4 100644
--- a/web/src/components/layout/Header.tsx
+++ b/web/src/components/layout/Header.tsx
@@ -154,22 +154,22 @@ export const Header = () => {
{/* TODO: skal trolig ikke være så synlig ved lansering */}
Foreninger*
-
-
-
- Mitt medlemskap
+ Mitt medlemskap
+
+
+
diff --git a/web/src/components/layout/header.module.scss b/web/src/components/layout/header.module.scss
index 8a7710e..7cf576e 100644
--- a/web/src/components/layout/header.module.scss
+++ b/web/src/components/layout/header.module.scss
@@ -155,26 +155,77 @@
transition: all var(--transition-easing);
+ a {
+ --size-icon: var(--font-size-caption);
+ display: inline-block;
+ padding: 0 calc(var(--size-icon) + .75rem);
+ transform: translateX(calc((var(--size-icon) + .75rem) * -1));
+ position: relative;
+ transition: transform .3s ease;
+
+ &:before {
+ content: "";
+ display: inline-block;
+ vertical-align: middle;
+ width: var(--size-icon);
+ height: var(--size-icon);
+ margin-bottom: .16rem;
+ margin-right: var(--spacing-xs);
+ border-radius: var(--size-icon);
+ background: var(--color-goldenOrange);
+ position: absolute;
+ left: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ opacity: 0;
+ transition: transform .4s ease, opacity .2s ease;;
+ }
+
+ &:hover {
+ transform: translateX(0);
+ opacity: 1;
+ &:before {
+ opacity: 1;
+ }
+ }
+ }
+
ul {
display: flex;
flex-direction: column;
justify-content: center;
- font-size: 1.4rem;
+ font-size: 1.2rem;
padding: var(--spacing-sitepadding-block) 0;
}
}
.menuItemLarge {
- font-size: 2rem;
+ font-size: 1.6rem;
}
.divider {
- margin-top: var(--spacing-l);
+ margin-top: var(--spacing-m);
}
-.search,
-.galtinn {
- margin-top: var(--spacing-m);
+.search {
+ margin-top: var(--spacing-l);
+ width: 100%;
+ max-width: 16rem;
+ font-size: var(--font-size-body);
+ font-weight: 500;
+ color: var(--color-deepBrick);
+ position: relative;
+
+ input {
+ width: 100%;
+ padding-right: 2rem;
+ }
+}
+
+.searchIcon {
+ position: absolute;
+ right: 1rem;
+ bottom: .6rem;
}
@media (max-width: 1200px) {
diff --git a/web/src/css/base.scss b/web/src/css/base.scss
index 3f1f747..bc33901 100644
--- a/web/src/css/base.scss
+++ b/web/src/css/base.scss
@@ -124,13 +124,26 @@ blockquote {
input[type="text"] {
border-radius: 10rem;
background: var(--color-white);
- color: var(--color-text);
- border: none;
+ color: currentColor;
+ border: 2px solid currentColor;
padding: var(--spacing-xs) var(--spacing-s);
font-family: inherit;
font-size: var(--font-size-body);
font-weight: 500;
transition: opacity var(--transition-easing);
+
+ &::placeholder {
+ font-weight: 400;
+ color: currentColor;
+ opacity: .6;
+ }
+
+ &:focus, &:hover {
+ outline: none;
+ border-color: var(--color-goldenOrange);
+ box-shadow: 0 0 0 1px var(--color-goldenOrange);
+ transition: box-shadow .3s ease, border-color .3s ease;
+ }
}
select {
diff --git a/web/src/css/button.scss b/web/src/css/button.scss
index adbd8aa..0b1c9c5 100644
--- a/web/src/css/button.scss
+++ b/web/src/css/button.scss
@@ -11,7 +11,7 @@ button,
margin: 0 0 var(--spacing-xs);
font-family: var(--font-main);
font-size: var(--font-size-body);
- font-weight: 500;
+ font-weight: 500 !important;
text-decoration: none;
transition: opacity var(--transition-easing);
cursor: pointer;