From cf24f75391635fa49cbfdd0af6e538c2906dbc38 Mon Sep 17 00:00:00 2001 From: a-ill Date: Wed, 28 Jun 2023 17:17:51 +0300 Subject: [PATCH] Update --- Server/app/svelte/public/css/common.css | 2 +- Server/app/svelte/public/css/navbar.css | 23 ++++++++++---- .../svelte/src/affiliates-component.svelte | 4 +-- .../svelte/src/communities-component.svelte | 4 +-- .../svelte/src/cooperatives-component.svelte | 4 +-- Server/app/svelte/src/groups-component.svelte | 2 +- .../app/svelte/src/join-us-component.svelte | 2 +- .../app/svelte/src/landing-component.svelte | 30 ++++--------------- .../app/svelte/src/manifesto-component.svelte | 16 +++++----- .../svelte/src/navbar/navbar-component.svelte | 6 ++-- Server/public/css/common.css | 2 +- Server/public/css/navbar.css | 23 ++++++++++---- .../js/components/affiliates-component.js | 2 +- .../js/components/communities-component.js | 2 +- .../js/components/cooperatives-component.js | 2 +- .../public/js/components/groups-component.js | 2 +- .../public/js/components/join-us-component.js | 2 +- .../public/js/components/landing-component.js | 2 +- .../js/components/manifesto-component.js | 2 +- .../public/js/components/navbar-component.js | 2 +- 20 files changed, 71 insertions(+), 63 deletions(-) diff --git a/Server/app/svelte/public/css/common.css b/Server/app/svelte/public/css/common.css index 3b8eff6..12b83f4 100644 --- a/Server/app/svelte/public/css/common.css +++ b/Server/app/svelte/public/css/common.css @@ -104,7 +104,7 @@ h1 { } h2 { - font-size: 1.8rem; + font-size: 1.7rem; font-family: var(--sans-serif, sans-serif); font-weight: bold; color: #222222; diff --git a/Server/app/svelte/public/css/navbar.css b/Server/app/svelte/public/css/navbar.css index 133dba9..f9cfd6d 100644 --- a/Server/app/svelte/public/css/navbar.css +++ b/Server/app/svelte/public/css/navbar.css @@ -59,6 +59,8 @@ #menu a{ display: block; padding: 1.9rem; + padding-top: 1rem; + padding-bottom: 1rem; color: black; font-size: 1.4rem; } @@ -133,6 +135,10 @@ position: fixed; } +#side-menu:checked ~ #logo-container { + position: fixed; +} + #side-menu:checked ~ #hamb #hamb-line { background: transparent; } @@ -178,13 +184,13 @@ /* Responsiveness */ @media only screen and (min-width: 1500px) { - #navbar{ + #navbar { left: 50%; -ms-transform: translateX(-50%); transform: translateX(-50%); } - #nav{ + #nav { max-height: none; top: 0; position: relative; @@ -192,15 +198,22 @@ width: fit-content; background-color: transparent; } - #menu li{ + #menu li { float: left; } - #menu a:hover{ + + #menu a:hover { background-color: transparent; color: rgb(127, 127, 127); } - #hamb{ + #menu a { + padding: 1.9rem; + } + + + + #hamb { display: none; } } \ No newline at end of file diff --git a/Server/app/svelte/src/affiliates-component.svelte b/Server/app/svelte/src/affiliates-component.svelte index 9733c17..0228a72 100644 --- a/Server/app/svelte/src/affiliates-component.svelte +++ b/Server/app/svelte/src/affiliates-component.svelte @@ -87,7 +87,7 @@ .affiliate-logo { position: relative; right: 0; - max-height: 8rem; + max-height: 6rem; max-width: 100%; border-radius: 1rem; } @@ -132,7 +132,7 @@ #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 1rem; margin-bottom: 4rem; } diff --git a/Server/app/svelte/src/communities-component.svelte b/Server/app/svelte/src/communities-component.svelte index 7a93ea2..a42c41f 100644 --- a/Server/app/svelte/src/communities-component.svelte +++ b/Server/app/svelte/src/communities-component.svelte @@ -46,7 +46,7 @@ #communities-img { position: absolute; - width: 11rem; + width: 11.5rem; left: 50%; transform: translate(-50%); z-index: 0; @@ -97,7 +97,7 @@ #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 1rem; margin-bottom: 4rem; } diff --git a/Server/app/svelte/src/cooperatives-component.svelte b/Server/app/svelte/src/cooperatives-component.svelte index 4cab967..b3a41ed 100644 --- a/Server/app/svelte/src/cooperatives-component.svelte +++ b/Server/app/svelte/src/cooperatives-component.svelte @@ -84,7 +84,7 @@ .coop-logo { position: relative; right: 0; - max-height: 8rem; + max-height: 6rem; max-width: 100%; } @@ -128,7 +128,7 @@ #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 1rem; margin-bottom: 4rem; } diff --git a/Server/app/svelte/src/groups-component.svelte b/Server/app/svelte/src/groups-component.svelte index 02e1153..6f93613 100644 --- a/Server/app/svelte/src/groups-component.svelte +++ b/Server/app/svelte/src/groups-component.svelte @@ -94,7 +94,7 @@ #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 1rem; margin-bottom: 4rem; } diff --git a/Server/app/svelte/src/join-us-component.svelte b/Server/app/svelte/src/join-us-component.svelte index e5b09d9..36089d1 100644 --- a/Server/app/svelte/src/join-us-component.svelte +++ b/Server/app/svelte/src/join-us-component.svelte @@ -135,7 +135,7 @@ None of them near you? Not a problem! Join our WhatsApp group and we will help y #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 1rem; margin-bottom: 4rem; } diff --git a/Server/app/svelte/src/landing-component.svelte b/Server/app/svelte/src/landing-component.svelte index 87524d8..c19754d 100644 --- a/Server/app/svelte/src/landing-component.svelte +++ b/Server/app/svelte/src/landing-component.svelte @@ -51,32 +51,14 @@ #container-grid > div > h2 { text-align: center; } - - #groups-img { + + #groups-img, #communities-img, #coops-img { position: absolute; - width: 14rem; - left: 50%; - transform: translate(-50%); - z-index: 0; - opacity: 0.2; - } - - #communities-img { - position: absolute; - width: 11rem; - left: 50%; - transform: translate(-50%); - z-index: 0; - opacity: 0.2; - } - - #coops-img { - position: absolute; - width: 10.5rem; left: 50%; transform: translate(-50%); z-index: 0; opacity: 0.2; + height: 8rem; } #text-container { @@ -91,7 +73,7 @@ #container { margin: auto; - max-width: 1200px; + max-width: 1000px; margin-top: 2rem; margin-bottom: 5rem; } @@ -106,7 +88,7 @@ #container-grid { display: grid; - grid-template-columns: 1.2fr 1.05fr 1fr; + grid-template-columns: 1.2fr 1.1fr 1fr; grid-gap: 4rem; margin-top: 2rem; } @@ -117,7 +99,7 @@ #container-grid > div > p { position: relative; - margin-top: 7rem; + margin-top: 5rem; z-index: 2; } diff --git a/Server/app/svelte/src/manifesto-component.svelte b/Server/app/svelte/src/manifesto-component.svelte index 5b83618..efbbe6a 100644 --- a/Server/app/svelte/src/manifesto-component.svelte +++ b/Server/app/svelte/src/manifesto-component.svelte @@ -237,7 +237,7 @@ position: fixed; display: flex; flex-direction: column; - border: #a9a9a9 0.1rem solid; + border: #cdcdcd 0.1rem solid; border-radius: 1rem; padding: 2rem; padding-right: 0.8rem; @@ -250,7 +250,7 @@ #toggle-content { position: relative; width: 100%; - font-size: 1.3rem; + font-size: 1.2rem; font-family: var(--sans-serif,sans-serif); text-align: left; margin-bottom: 1rem; @@ -280,11 +280,11 @@ color: black; height: auto; width: 100%; - padding-top: 0.5rem; - padding-bottom: 0.5rem; + padding-top: 0.25rem; + padding-bottom: 0.35rem; text-align: left; font-family: var(--sans-serif,sans-serif); - font-size: 1.3rem; + font-size: 1.2rem; } .level0 { @@ -299,7 +299,7 @@ z-index: 1; margin-left: 1rem; width: calc(100% - 1rem); - border-left: #a9a9a9 0.1rem solid; + border-left: #cdcdcd 0.1rem solid; } .heading-button:hover { @@ -312,7 +312,7 @@ h1 { margin-bottom: 1rem; - font-size: 2.2rem; + font-size: 2rem; text-align: center; } @@ -328,7 +328,7 @@ #text-container { position: relative; display: grid; - grid-template-columns: 20rem 800px 20rem; + grid-template-columns: 20rem 700px 20rem; grid-gap: 2rem; max-width: calc(100vw - 4rem); margin: auto; diff --git a/Server/app/svelte/src/navbar/navbar-component.svelte b/Server/app/svelte/src/navbar/navbar-component.svelte index 9ef9d4b..3d18ede 100644 --- a/Server/app/svelte/src/navbar/navbar-component.svelte +++ b/Server/app/svelte/src/navbar/navbar-component.svelte @@ -33,14 +33,14 @@