diff --git a/apps/svelte.dev/src/routes/_home/Video.svelte b/apps/svelte.dev/src/routes/_home/Video.svelte index af8255676f..13fa62007a 100644 --- a/apps/svelte.dev/src/routes/_home/Video.svelte +++ b/apps/svelte.dev/src/routes/_home/Video.svelte @@ -218,8 +218,7 @@ .captions { line-height: 1; color: white; - font-size: 2rem; - font-weight: 700; + font-size: var(--sk-font-size-ui-medium); filter: var(--control-filter); } diff --git a/apps/svelte.dev/src/routes/blog/+page.svelte b/apps/svelte.dev/src/routes/blog/+page.svelte index 97cbcafaaa..8bfd036de4 100644 --- a/apps/svelte.dev/src/routes/blog/+page.svelte +++ b/apps/svelte.dev/src/routes/blog/+page.svelte @@ -55,7 +55,6 @@ color: var(--sk-text-4); font-family: var(--sk-font-ui); font-size: var(--sk-font-size-ui-small); - font-weight: 400; text-transform: uppercase; } @@ -68,8 +67,7 @@ padding: 0 0 4rem 0; h2 { - font-size: 4rem; - font-weight: 400; + font-size: var(--sk-font-size-h1); color: var(--sk-text-2); } } diff --git a/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte b/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte index 216614e4e8..1d656f7adc 100644 --- a/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte +++ b/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte @@ -51,8 +51,7 @@ } h1 { - font-size: 4rem; - font-weight: 500; + font-size: var(--sk-font-size-h1); } .standfirst { diff --git a/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte b/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte index a36f9eaa08..3cb73e71ed 100644 --- a/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte +++ b/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte @@ -110,7 +110,6 @@ display: block; font-size: var(--sk-font-size-ui-medium); text-transform: uppercase; - font-weight: 400; font-family: var(--sk-font-ui); color: var(--sk-text-3); } diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/+page.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/+page.svelte index e049b191a7..a6ba473858 100644 --- a/apps/svelte.dev/src/routes/tutorial/[slug]/+page.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[slug]/+page.svelte @@ -384,6 +384,7 @@ background: var(--sk-back-2); display: flex; flex-direction: column; + font-size: var(--sk-font-size-ui-small); } .navigator .solve { diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/Loading.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/Loading.svelte index 70d25468ef..2cd9314fc6 100644 --- a/apps/svelte.dev/src/routes/tutorial/[slug]/Loading.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[slug]/Loading.svelte @@ -135,6 +135,7 @@ background: var(--sk-back-2); user-select: none; font-family: var(--sk-font-ui); + font-size: var(--sk-font-size-ui-small); } .progress-container { diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte index 756b126955..434930d134 100644 --- a/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte @@ -186,19 +186,11 @@ width: 100%; } - .menu.open { - border-radius: var(--sk-border-radius) var(--sk-border-radius) 0 0; - } - header strong, h1 { font-family: inherit; } - .menu { - border: none; - } - header strong { color: var(--sk-theme-1); } @@ -225,15 +217,19 @@ box-shadow: var(--sk-shadow); cursor: pointer; - } - .menu > button { - display: flex; - justify-content: center; - align-items: center; - gap: 0.4ch; - width: 100%; - height: 100%; + &.open { + border-radius: var(--sk-border-radius) var(--sk-border-radius) 0 0; + } + + & > button { + display: flex; + justify-content: center; + align-items: center; + gap: 0.4ch; + width: 100%; + height: 100%; + } } h1 { @@ -251,16 +247,16 @@ text-align: center; color: var(--sk-text-2); font-size: var(--sk-font-size-ui-small); - } - h1 .desktop { - display: flex; - gap: 0.5ch; - align-items: center; - } + .desktop { + display: flex; + gap: 0.5ch; + align-items: center; + } - h1 .mobile { - display: none; + .mobile { + display: none; + } } .expand-icon :global(svg) { @@ -342,19 +338,10 @@ stroke-width: 0 !important; } - li.expanded > button { - font-weight: bold; - } - li.expanded > button > :global(svg) { transform: rotate(90deg); } - li a::before, - li a::after { - position: absolute; - } - .exercise { --dot-size: 1.2rem; --color: var(--sk-text-2); @@ -364,11 +351,11 @@ button { color: var(--sk-text-2); padding: 0 0 0 0.5rem; - margin: 0 0.5rem 0 0; display: block; font-variant-numeric: tabular-nums; - border: 2px solid transparent; box-sizing: border-box; + font-size: var(--sk-font-size-ui-medium); + line-height: 1.5; } li button { diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/ScreenToggle.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/ScreenToggle.svelte index d6d0a0313b..b7285268bf 100644 --- a/apps/svelte.dev/src/routes/tutorial/[slug]/ScreenToggle.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[slug]/ScreenToggle.svelte @@ -43,6 +43,7 @@ z-index: 2; margin: 0 auto; box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.07); + font-size: var(--sk-font-size-ui-small); } @media (min-width: 832px) { diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/Sidebar.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/Sidebar.svelte index ce4bdcac47..8095d734f2 100644 --- a/apps/svelte.dev/src/routes/tutorial/[slug]/Sidebar.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[slug]/Sidebar.svelte @@ -123,67 +123,65 @@ padding: 2.2rem 3rem; border-right: 1px solid var(--sk-back-4); background: var(--sk-back-3); - } - .text :global(pre) { - background: var(--sk-back-1); - box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.1); - border-radius: var(--sk-border-radius); - } + :global { + pre { + background: var(--sk-back-1); + box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.1); + border-radius: var(--sk-border-radius); - .text :global(pre) :global(.highlight) { - --color: rgba(220, 220, 0, 0.2); - background: var(--color); - outline: 2px solid var(--color); - border-radius: 2px; - } + .highlight { + --color: rgba(220, 220, 0, 0.2); + background: var(--color); + outline: 2px solid var(--color); + border-radius: 2px; - .text :global(pre) :global(.highlight.add) { - --color: rgba(0, 255, 0, 0.18); - } + &.add { + --color: rgba(0, 255, 0, 0.18); + } - .text :global(pre) :global(.highlight.remove) { - --color: rgba(255, 0, 0, 0.1); - } + &.remove { + --color: rgba(255, 0, 0, 0.1); - :global(html.dark) .text :global(pre) :global(.highlight.remove) { - --color: rgba(255, 0, 0, 0.27); - } + :root.dark & { + --color: rgba(255, 0, 0, 0.27); + } + } + } + } - /** this probably belongs in site-kit */ - .text :global(p) :global(a) :global(code) { - color: var(--sk-theme-1); - background: rgba(255, 62, 0, 0.1); - } + p a code { + color: var(--sk-theme-1); + background: rgba(255, 62, 0, 0.1); + } - .text :global([data-file]), - .text :global(.filename) { - cursor: pointer; - background-image: url($lib/icons/file-edit.svg); - background-repeat: no-repeat; - } + [data-file], + .filename { + cursor: pointer; + background-image: url($lib/icons/file-edit.svg); + background-repeat: no-repeat; - .text :global([data-file]) { - background-position: 0.5rem 50%; - background-size: 1rem 1rem; - padding-left: 2rem; - } + :root.dark & { + background-image: url($lib/icons/file-edit-inline-dark.svg); + } + } - .text :global(.filename) { - background-position: 1rem 54%; - background-size: 1rem 1rem; - padding-left: 2.5rem !important; - } + [data-file] { + background-position: 0.5rem 50%; + background-size: 1rem 1rem; + padding-left: 2rem; + } - @media (prefers-color-scheme: dark) { - .text :global([data-file]), - .text :global(.filename) { - background-image: url($lib/icons/file-edit-inline-dark.svg); - } - } + .filename { + background-position: 1rem 54%; + background-size: 1rem 1rem; + padding-left: 2.5rem !important; + } - .text :global(.desktop) { - display: none; + .desktop { + display: none; + } + } } footer { @@ -193,38 +191,40 @@ background: var(--sk-back-3); border-top: 1px solid var(--sk-back-4); border-right: 1px solid var(--sk-back-4); - } - footer .edit { - color: var(--sk-text-2); - font-family: var(--sk-font-ui); - font-size: var(--sk-font-size-ui-medium); - padding: 0 0 0 1.4em; - background: url($lib/icons/file-edit.svg) no-repeat 0 calc(50% - 0.1em); - background-size: 1em 1em; + .edit { + color: var(--sk-text-2); + font-family: var(--sk-font-ui); + font-size: var(--sk-font-size-ui-medium); + padding: 0 0 0 1.4em; + background: url($lib/icons/file-edit.svg) no-repeat 0 calc(50% - 0.1em); + background-size: 1em 1em; + } } - .modal-contents h2 { - font-size: 2.4rem; - margin: 0 0 0.5em 0; - } + .modal-contents { + h2 { + font-size: 2.4rem; + margin: 0 0 0.5em 0; + } - .modal-contents label { - user-select: none; - } + label { + user-select: none; + } - .modal-contents button { - display: block; - background-color: var(--sk-theme-1); - color: white; - padding: 1rem; - width: 10em; - margin: 1em 0 0 0; - border-radius: var(--sk-border-radius); - line-height: 1; + button { + display: block; + background-color: var(--sk-theme-1); + color: white; + padding: 1rem; + width: 10em; + margin: 1em 0 0 0; + border-radius: var(--sk-border-radius); + line-height: 1; + } } - @media (max-width: 800px) { + @media (max-width: 799px) { .text { border-right: none; } diff --git a/packages/repl/src/lib/CodeMirror.svelte b/packages/repl/src/lib/CodeMirror.svelte index de5fb19c5a..9ef0fd40bd 100644 --- a/packages/repl/src/lib/CodeMirror.svelte +++ b/packages/repl/src/lib/CodeMirror.svelte @@ -389,7 +389,6 @@ .cm-diagnosticText strong { font-size: 0.9em; - /* font-weight: 700; */ font-family: var(--sk-font-mono); opacity: 0.7; } diff --git a/packages/repl/src/lib/Input/Migrate.svelte b/packages/repl/src/lib/Input/Migrate.svelte index 05f5d1cc82..6d07626b7f 100644 --- a/packages/repl/src/lib/Input/Migrate.svelte +++ b/packages/repl/src/lib/Input/Migrate.svelte @@ -14,7 +14,6 @@ position: relative; display: flex; text-transform: uppercase; - font-weight: 300; font-size: var(--sk-font-size-ui-small); padding: 0.8rem; gap: 0.5rem; diff --git a/packages/repl/src/lib/Input/RunesInfo.svelte b/packages/repl/src/lib/Input/RunesInfo.svelte index c99ac71a07..dd5114aeb4 100644 --- a/packages/repl/src/lib/Input/RunesInfo.svelte +++ b/packages/repl/src/lib/Input/RunesInfo.svelte @@ -69,7 +69,6 @@ position: relative; display: flex; text-transform: uppercase; - font-weight: 300; font-size: var(--sk-font-size-ui-small); padding: 0.8rem; gap: 0.5rem; diff --git a/packages/repl/src/lib/Output/console/ConsoleLine.svelte b/packages/repl/src/lib/Output/console/ConsoleLine.svelte index 74c4dfed5a..463605c25e 100644 --- a/packages/repl/src/lib/Output/console/ConsoleLine.svelte +++ b/packages/repl/src/lib/Output/console/ConsoleLine.svelte @@ -195,10 +195,6 @@ } } - .group { - font-weight: 700; - } - .log { padding: 0.5rem 1rem 0.5rem calc(1rem + var(--indent)); display: flex; diff --git a/packages/repl/src/lib/Output/console/ConsoleTable.svelte b/packages/repl/src/lib/Output/console/ConsoleTable.svelte index f0c75d5516..0f9081f4db 100644 --- a/packages/repl/src/lib/Output/console/ConsoleTable.svelte +++ b/packages/repl/src/lib/Output/console/ConsoleTable.svelte @@ -104,6 +104,7 @@ table { border-collapse: collapse; line-height: 1; + font-family: var(--sk-font-mono); } th { diff --git a/packages/site-kit/src/lib/components/Text.svelte b/packages/site-kit/src/lib/components/Text.svelte index 43ac224d3b..bf40218f63 100644 --- a/packages/site-kit/src/lib/components/Text.svelte +++ b/packages/site-kit/src/lib/components/Text.svelte @@ -106,7 +106,6 @@ flex: 1; font-family: var(--sk-font-mono); font-size: var(--sk-font-size-code); - font-weight: 400; padding: 0 1rem; color: var(--sk-text-2); diff --git a/packages/site-kit/src/lib/docs/DocsContents.svelte b/packages/site-kit/src/lib/docs/DocsContents.svelte index caf177bb17..a268aaef06 100644 --- a/packages/site-kit/src/lib/docs/DocsContents.svelte +++ b/packages/site-kit/src/lib/docs/DocsContents.svelte @@ -95,7 +95,6 @@ padding-bottom: 0.8rem; font-size: var(--sk-font-size-h3); font-family: var(--sk-font-heading); - font-weight: 500; color: var(--sk-text-1); } @@ -139,12 +138,6 @@ background-color: var(--sk-back-4); } - - [aria-current='page'] { - background-color: hsla(var(--sk-theme-1-hsl), 0.1) !important; - color: var(--sk-theme-1) !important; - font-weight: 400; - } } @media (min-width: 832px) { diff --git a/packages/site-kit/src/lib/nav/NavContextMenu.svelte b/packages/site-kit/src/lib/nav/NavContextMenu.svelte index cd0ca6b15e..31498acb49 100644 --- a/packages/site-kit/src/lib/nav/NavContextMenu.svelte +++ b/packages/site-kit/src/lib/nav/NavContextMenu.svelte @@ -108,7 +108,6 @@ font-size: var(--sk-font-size-ui-medium); text-transform: uppercase; letter-spacing: 0.1em; - font-weight: 600; color: var(--sk-text-3); } @@ -142,16 +141,14 @@ padding: 0 0.75rem !important; transition: 0.1s ease; transition-property: background-color, color; + + &[aria-current='true'] { + color: var(--sk-theme-1) !important; + } } a:hover { text-decoration: none; background-color: var(--sk-back-4); } - - [aria-current='true'] { - /* background-color: hsla(var(--sk-theme-1-hsl), 0.1) !important; */ - color: var(--sk-theme-1) !important; - font-weight: 400; - } diff --git a/packages/site-kit/src/lib/search/SearchBox.svelte b/packages/site-kit/src/lib/search/SearchBox.svelte index 48a23fe4f9..b00d5a75f0 100644 --- a/packages/site-kit/src/lib/search/SearchBox.svelte +++ b/packages/site-kit/src/lib/search/SearchBox.svelte @@ -420,7 +420,6 @@ It appears when the user clicks on the `Search` component or presses the corresp font-family: var(--sk-font-ui); font-size: var(--sk-font-size-ui-medium); color: var(--sk-text-4); - font-weight: normal; text-transform: uppercase; pointer-events: all; diff --git a/packages/site-kit/src/lib/search/SearchResultList.svelte b/packages/site-kit/src/lib/search/SearchResultList.svelte index 64d4b8658e..43cc4b6d07 100644 --- a/packages/site-kit/src/lib/search/SearchResultList.svelte +++ b/packages/site-kit/src/lib/search/SearchResultList.svelte @@ -162,7 +162,6 @@ white-space: nowrap; line-height: 1; text-overflow: ellipsis; - font-weight: 400; } strong { diff --git a/packages/site-kit/src/lib/search/SearchResults.svelte b/packages/site-kit/src/lib/search/SearchResults.svelte index 1955134367..171643332f 100644 --- a/packages/site-kit/src/lib/search/SearchResults.svelte +++ b/packages/site-kit/src/lib/search/SearchResults.svelte @@ -33,7 +33,6 @@ Renders a list of search results padding: var(--padding); font-size: var(--sk-font-size-ui-medium); color: var(--sk-text-4); - font-weight: normal; text-transform: uppercase; background-color: var(--sk-back-2); border-radius: 0 0 var(--sk-border-radius) var(--sk-border-radius); diff --git a/packages/site-kit/src/lib/styles/base.css b/packages/site-kit/src/lib/styles/base.css index 4434987624..0f76050c62 100644 --- a/packages/site-kit/src/lib/styles/base.css +++ b/packages/site-kit/src/lib/styles/base.css @@ -74,16 +74,19 @@ h3 { font-size: var(--sk-font-size-h3); } -:where(h1, h2, h3) { +h1, +h2, +h3 { position: relative; font-family: var(--sk-font-heading); font-weight: 500; line-height: 1.2; + text-wrap: balance; color: var(--sk-text-1); } strong { - font-weight: 600; + font-weight: 400; } code,