diff --git a/src/assets/style/components/analysis.scss b/src/assets/style/components/analysis.scss index 673677c..5ae188d 100644 --- a/src/assets/style/components/analysis.scss +++ b/src/assets/style/components/analysis.scss @@ -58,7 +58,7 @@ background-color: helpers.$background-dark; .analysis-item-label { - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; color: helpers.$text-white; font-size: 20px; font-style: normal; diff --git a/src/assets/style/components/footer.scss b/src/assets/style/components/footer.scss index be0ffe5..7fa6aa4 100644 --- a/src/assets/style/components/footer.scss +++ b/src/assets/style/components/footer.scss @@ -39,7 +39,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font &-title { color: $text-white; - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; font-size: 28px; font-weight: bold; margin-top: 16px; @@ -73,7 +73,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font &-link { color: $text-white; - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; font-size: 16px; font-weight: bold; text-decoration: none; @@ -174,7 +174,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font border: none; border-radius: 2px; background: #FF9517; - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; color: #000; font-size: 22px; font-style: normal; diff --git a/src/assets/style/components/navigation.scss b/src/assets/style/components/navigation.scss index 95a0193..ef50283 100644 --- a/src/assets/style/components/navigation.scss +++ b/src/assets/style/components/navigation.scss @@ -29,7 +29,7 @@ $white: #ffffff; &-logo { width: 270px; - height: 66px; + height: 72px; } &-desktop { @@ -42,7 +42,7 @@ $white: #ffffff; } &-link { - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; font-weight: 600; font-size: 22px; color: $white; @@ -72,7 +72,7 @@ $white: #ffffff; } &-label { - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; font-weight: 600; font-size: 22px; cursor: pointer; @@ -95,8 +95,8 @@ $white: #ffffff; top: 100%; left: 0; width: 100%; - min-width: 300px; - padding-top: 38px; + min-width: 350px; + padding-top: 42px; opacity: 0; visibility: hidden; transition: all 0.2s ease; @@ -112,27 +112,36 @@ $white: #ffffff; background: transparent; } - & > div { - background-color: $background3; - box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); - padding: 1rem; - } + // & > div { + // background-color: $background3; + // box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + // padding: 0.5rem; + // } } &-content-community { min-width: 150px; } + &-wrapper { + padding: 24px 16px; + background-color: #1d1f23; + } + &-item { display: block; color: $white; text-decoration: none; - padding: 1rem; + // padding: 1rem; transition: color 0.2s ease; background-color: #1d1f23; &:hover { color: $primary; } + margin-bottom: 20px; + &:last-child { + margin-bottom: 0; + } } &-item-community { @@ -142,14 +151,16 @@ $white: #ffffff; } &-title { - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; font-weight: 600; font-size: 22px; + line-height: 1.5; } &-description { color: $secondary-text; font-size: 18px; + line-height: 1.5; } &-icon { diff --git a/src/assets/style/helpers.scss b/src/assets/style/helpers.scss index 51cadd4..0036b56 100644 --- a/src/assets/style/helpers.scss +++ b/src/assets/style/helpers.scss @@ -1,8 +1,4 @@ -@font-face { - font-family:"rigid-square"; - src:url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/l?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("woff2"),url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/d?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("woff"),url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/a?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("opentype"); - font-display:auto;font-style:normal;font-weight:600;font-stretch:normal; -} +@import url("https://use.typekit.net/zsp2dhp.css"); @import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap'); diff --git a/src/assets/style/style.scss b/src/assets/style/style.scss index 63b5678..a742d22 100644 --- a/src/assets/style/style.scss +++ b/src/assets/style/style.scss @@ -28,7 +28,7 @@ body { } h1, h2, h3, h4, h5, h6{ - font-family: 'rigid-square'; + font-family: 't26-carbon', 'sans-serif'; } a { diff --git a/src/components/navigation.rs b/src/components/navigation.rs index 1ccccac..6715fb1 100644 --- a/src/components/navigation.rs +++ b/src/components/navigation.rs @@ -54,68 +54,77 @@ pub fn Navigation() -> impl IntoView {