Skip to content

Commit

Permalink
Merge pull request #261 from scroll-tech/develop
Browse files Browse the repository at this point in the history
Update: 6/3/2024
  • Loading branch information
dghelm authored Jun 3, 2024
2 parents ea6debd + f5e7cb2 commit 677e62a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ enode://c7b2d94e95da343db6e667a01cef90376a592f2d277fbcbf6e9c9186734ed8003d013895
"londonBlock": 0,
"archimedesBlock": 0,
"shanghaiBlock": 0,
"bernoulliBlock": 5220340,
"clique": {
"period": 3,
"epoch": 30000
Expand Down
13 changes: 1 addition & 12 deletions src/layouts/MainLayout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,7 @@ changeLanguage(content.lang)
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Fira+Code:wght@500&family=Roboto+Flex:opsz,[email protected],400;8..144,500;8..144,600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;500&family=Roboto+Flex:opsz,[email protected],400;8..144,500;8..144,600&display=swap"
rel="stylesheet"
/>

<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;500&family=Roboto+Flex:opsz,[email protected],400;8..144,500;8..144,600&family=Roboto+Mono:ital,wght@0,400;0,500;0,600;1,400;1,500;1,600&display=swap"
href="https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;500&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&family=Roboto+Mono:ital,wght@0,400;0,500;0,600;1,400;1,500;1,600&display=swap"
rel="stylesheet"
/>

Expand Down
2 changes: 1 addition & 1 deletion src/styles/design-system/values/font.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:root {
--font-family-text: "trans-sans", "circular", Arial, "Helvetica Neue", Helvetica, sans-serif;
--font-family-code: "Roboto Mono", "Fira Code", "Courier New", monospace, sans-serif;
--font-family-body-text: "Roboto Flex", "trans-sans", "circular", Arial, "Helvetica Neue", Helvetica, sans-serif;
--font-family-body-text: "Roboto", "trans-sans", "circular", Arial, "Helvetica Neue", Helvetica, sans-serif;

/* Font weights */
--font-weight-normal: 400;
Expand Down
4 changes: 0 additions & 4 deletions src/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ article > section iframe {
position: relative;
}

.main-section :is(h1, h2, h3) {
font-family: var(--font-family-text);
}

.main-section .remix-callout {
margin-top: 30px;
}
Expand Down

0 comments on commit 677e62a

Please sign in to comment.