Skip to content

Commit

Permalink
type styles 💅
Browse files Browse the repository at this point in the history
  • Loading branch information
Marguerite Roth committed Aug 15, 2021
1 parent 6769e8e commit 741fc1b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 120 deletions.
10 changes: 4 additions & 6 deletions src/components/_ui/Button/Button.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,7 +13,7 @@

&--size {
&-xl {
font-size: 1.15em;
font-size: 1.45em;
padding: 1.1em 3em 1.1em;

&:hover {
Expand All @@ -24,7 +22,7 @@
}

&-l {
font-size: 1em;
font-size: 1.25em;
padding: 0.65em 1.5em 0.7em;

&:hover {
Expand All @@ -33,7 +31,7 @@
}

&-s {
font-size: 0.95em;
font-size: 1em;
padding: 0.45em 1.25em 0.5em;
}
}
Expand Down
32 changes: 3 additions & 29 deletions src/pages/index.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
87 changes: 2 additions & 85 deletions src/styles/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down

0 comments on commit 741fc1b

Please sign in to comment.