From 741fc1ba746ade3e478d60dcecf94d0c2cea1257 Mon Sep 17 00:00:00 2001 From: Marguerite Roth Date: Sat, 14 Aug 2021 22:31:34 -0400 Subject: [PATCH] =?UTF-8?q?type=20styles=20=F0=9F=92=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/_ui/Button/Button.scss | 10 ++- src/pages/index.scss | 32 +--------- src/styles/globals.scss | 87 +-------------------------- 3 files changed, 9 insertions(+), 120 deletions(-) diff --git a/src/components/_ui/Button/Button.scss b/src/components/_ui/Button/Button.scss index b3690e5..597c4fc 100755 --- a/src/components/_ui/Button/Button.scss +++ b/src/components/_ui/Button/Button.scss @@ -1,11 +1,9 @@ @import "../../../styles/lib.scss"; .Button { - font-weight: 500; border: 1px solid transparent; transition: all 150ms ease-out; - font-family: "Circular", sans-serif; - font-family: 'Space Mono', monospace; + font-family: "Covik Sans", -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif; &:hover { cursor: pointer; @@ -15,7 +13,7 @@ &--size { &-xl { - font-size: 1.15em; + font-size: 1.45em; padding: 1.1em 3em 1.1em; &:hover { @@ -24,7 +22,7 @@ } &-l { - font-size: 1em; + font-size: 1.25em; padding: 0.65em 1.5em 0.7em; &:hover { @@ -33,7 +31,7 @@ } &-s { - font-size: 0.95em; + font-size: 1em; padding: 0.45em 1.25em 0.5em; } } diff --git a/src/pages/index.scss b/src/pages/index.scss index 7b8f36d..a8fe45c 100644 --- a/src/pages/index.scss +++ b/src/pages/index.scss @@ -1,34 +1,8 @@ @import "./../styles/lib"; @import 'node_modules/@fortawesome/fontawesome-svg-core/styles'; -.DessertPage { - padding-left: 2em; - padding-right: 2em; - - .DessertPerson__plot { - margin: 0 auto; - } - - .test { - width: 100%; - height: 30px; - display: flex; - justify-content: space-between; - padding-right: 1.15em; - padding-left: 5.25em; - - div { - height: 100%; - width: 2px; - background: pink; - } - - div.label { - width: 6em; - background: none; - text-align: center; - //transform: translateX(-50%); - border: 1px solid pink; - } +.Home { + &__greeting { + font-family: "Covik Sans", sans-serif; } } diff --git a/src/styles/globals.scss b/src/styles/globals.scss index 0a5928c..7364561 100644 --- a/src/styles/globals.scss +++ b/src/styles/globals.scss @@ -16,8 +16,8 @@ body, body { width: 100%; margin: 0 auto; - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif; - font-size: 16px; + font-family: "Covik Sans", -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif; + font-size: 18px; line-height: 1.5; color: $blue-900; -webkit-font-smoothing: antialiased; @@ -31,93 +31,10 @@ body { } } -// h1, -// h2, -// h3, -// h4, -// h5, -// h6 { -// font-family: "Circular", sans-serif; -// letter-spacing: -0.005em; - -// } - -// h1 { -// font-size: 2.75rem; -// font-size: 3em; -// margin-bottom: 1em; -// font-weight: 700; -// line-height: 115%; -// font-family: "TiemposHeadline", sans-serif; - -// font-size: 5.1em; -// font-weight: 900; -// line-height: 1.1; -// } - -// h2 { -// margin-bottom: 1.45rem; -// font-size: 2.7em; -// font-weight: 900; -// line-height: 1.3; -// font-family: "TiemposHeadline", sans-serif; -// } - -// h3 { -// line-height: 1.3; -// font-size: 1.4em; -// font-weight: 700; -// font-family: 'Space Mono', monospace; -// } - -// h5 { -// margin-bottom: 1.45rem; -// font-weight: 500; -// line-height: 20px; -// font-size: 0.95em; -// } - -// h6 { -// margin-bottom: 1rem; -// margin-top: 3em; -// font-size: 0.7em; -// font-weight: 600; -// text-transform: uppercase; -// letter-spacing: 0.055em; -// line-height: 1.1; -// text-align: center; -// } - a { color: currentColor; } -@media(max-width: 768px) { - h1 { - font-size: 2.5em; - } - - h2 { - font-size: 1.25em; - } - - h3 { - font-size: 1.1em; - } -} - -p { - font-weight: 400; - margin-bottom: 24px; - margin-top: 14px; - line-height: 1.6; - //font-family: 'Space Mono', monospace; - - strong { - font-weight: 600; - } -} - ul { margin-bottom: 2em; }