Skip to content

fix some CSS details #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 5, 2024
Merged

fix some CSS details #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6952753
fix font size
Rich-Harris Oct 5, 2024
4057b12
remove redundant CSS var
Rich-Harris Oct 5, 2024
fa3913a
fixes
Rich-Harris Oct 5, 2024
d468848
fix
Rich-Harris Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/(authed)/apps/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<style>
.apps {
padding: var(--sk-page-padding-top) var(--sk-page-padding-side) 6rem var(--sk-page-padding-side);
max-width: var(--sk-page-main-width);
max-width: var(--sk-page-content-width);
margin: 0 auto;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/blog/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
grid-gap: 1em;
min-height: calc(100vh - var(--sk-nav-height) - var(--sk-banner-bottom-height));
padding: var(--sk-page-padding-top) var(--sk-page-padding-side) 6rem var(--sk-page-padding-side);
max-width: var(--sk-page-main-width);
max-width: var(--sk-page-content-width);
box-sizing: content-box;
margin: 0 auto;
text-wrap: balance;
Expand Down
4 changes: 2 additions & 2 deletions apps/svelte.dev/src/routes/blog/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<style>
.post {
padding: var(--sk-page-padding-top) var(--sk-page-padding-side);
max-width: var(--sk-page-main-width);
max-width: var(--sk-page-content-width);
box-sizing: content-box;
margin: 0 auto;
}
Expand Down Expand Up @@ -109,7 +109,7 @@
@media (min-width: 910px) {
.post :global(.max) {
width: calc(100vw - 2 * var(--sk-page-padding-side));
margin: 0 calc(var(--sk-page-main-width) / 2 - 50vw);
margin: 0 calc(var(--sk-page-content-width) / 2 - 50vw);
text-align: center;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/docs/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<style>
.page {
padding: var(--sk-page-padding-top) var(--sk-page-padding-side);
max-width: var(--sk-page-main-width);
max-width: var(--sk-page-content-width);
box-sizing: content-box;
margin: auto;
text-wrap: balance;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/docs/[...path]/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
calc(
0.5 *
(
100vw - var(--sk-line-max-width) - var(--sk-page-padding-side) -
100vw - var(--sk-page-content-width) - var(--sk-page-padding-side) -
var(--sk-page-padding-side)
)
)
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/docs/[...path]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
}

.controls {
max-width: calc(var(--sk-line-max-width) + 1rem);
max-width: calc(var(--sk-page-content-width) + 1rem);
border-top: 1px solid var(--sk-back-4);
padding: 1rem 0 0 0;
display: grid;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
text-overflow: ellipsis;
text-align: center;
color: var(--sk-text-2);
font-size: var(--sk-font-size-ui-small);
font-size: var(--sk-font-size-ui-medium);

.desktop {
display: flex;
Expand Down
4 changes: 3 additions & 1 deletion packages/repl/src/lib/InputOutputToggle.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
justify-content: center;
width: 100%;
height: var(--pane-controls-h);
border-top: 1px solid var(--sk-theme-2);
border-top: 1px solid var(--sk-back-5);
font-family: var(--sk-font-ui);
font-size: var(--sk-font-size-ui-small);
z-index: 2;
}

Expand Down
4 changes: 1 addition & 3 deletions packages/repl/src/lib/Repl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,7 @@
}

.divider::after {
background-color: var(--sk-text-1);
filter: drop-shadow(0 0 3px hsl(0 0 0 / 0.5));
opacity: 0.1;
background-color: var(--sk-back-5);
}

[data-pane='main'] > .divider::after {
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/components/Text.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@

li {
position: relative;
max-width: calc(var(--sk-line-max-width) - var(--list-padding));
max-width: calc(var(--sk-page-content-width) - var(--list-padding));
margin: 0 0 0.5em 0;
}

Expand Down
7 changes: 3 additions & 4 deletions packages/site-kit/src/lib/nav/Nav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
isolation: isolate;
font-family: var(--sk-font-ui);

&.shadow::after {
&::after {
content: '';
position: absolute;
left: 0;
Expand All @@ -168,8 +168,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
align-items: center;
color: var(--sk-text-3);
margin-left: 0.4em;
padding: 0.1rem 0 0 0;
font-size: var(--sk-font-size-ui-small);
font-size: var(--sk-font-size-ui-medium);
}

@media (max-width: 799px) {
Expand Down Expand Up @@ -208,7 +207,7 @@ Top navigation bar for the application. It provides a slot for the left side, th

.home-link {
--padding-right: 1rem;
width: 13rem;
width: 16rem;
height: 100%;
background: url(../branding/svelte.svg) no-repeat var(--sk-page-padding-side) 50% /
calc(100% - var(--sk-page-padding-side) - var(--padding-right)) auto;
Expand Down
6 changes: 3 additions & 3 deletions packages/site-kit/src/lib/search/SearchBox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
use:trap
>
<div class="search-box">
<div style="background: var(--background)">
<div style="background: var(--background); padding: 0.5rem">
<!-- svelte-ignore a11y_autofocus -->
<input
autofocus
Expand Down Expand Up @@ -307,7 +307,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
input {
font-size: var(--sk-font-size-ui-large);
width: 100%;
padding: var(--padding) 5rem var(--padding) var(--padding);
padding: calc(var(--padding) - 0.5rem) 5rem calc(var(--padding) - 0.5rem) var(--padding);
height: 6rem;
border: none;
border-bottom: 1px solid var(--sk-back-3);
Expand All @@ -332,7 +332,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
button[aria-label='Close'] {
--size: 2rem;
position: absolute;
top: 0;
top: 0.5rem;
right: 0;
width: 5rem;
height: 6rem;
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/styles/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ blockquote {
position: relative;
margin: 2.4rem 0;
padding: 2rem 2.4rem 1.8rem 2.4rem;
max-width: var(--sk-line-max-width);
max-width: var(--sk-page-content-width);
}

blockquote :where(p, ul) {
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/styles/text.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
background: var(--sk-back-4);
padding: 1rem;
margin-bottom: 1rem;
max-width: var(--sk-line-max-width);
max-width: var(--sk-page-content-width);
border-radius: var(--sk-border-radius);
}

Expand Down
14 changes: 6 additions & 8 deletions packages/site-kit/src/lib/styles/tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
--sk-page-padding-side: 2.4rem;
--sk-thick-border-width: 0.3rem;
--sk-border-radius: 0.4rem;
--sk-page-main-width: 84rem;
--sk-page-content-width: 84rem;
--sk-banner-bottom-height: 0px;

/* typography */
Expand All @@ -32,13 +32,11 @@
--sk-font-size-h3: 2.4rem;
--sk-font-size-body: 2.1rem;
--sk-font-size-body-small: 1.8rem;
--sk-font-size-ui-small: 1.4rem;
--sk-font-size-ui-medium: 1.8rem;
--sk-font-size-ui-large: 3rem; /* TODO add regular/small */
--sk-font-size-ui-small: 1.3rem;
--sk-font-size-ui-medium: 1.6rem;
--sk-font-size-ui-large: 3rem;
--sk-font-size-code: 1.4rem;

--sk-line-max-width: 84rem; /* TODO can this be merged with --sk-page-main-width?

/* Base colors */
--sk-theme-1-hsl: 12, 93%, 43%;
--sk-theme-2-hsl: 240, 8%, 44%;
Expand All @@ -50,7 +48,7 @@
--sk-back-2: hsla(0, 0%, 100%, 1);
--sk-back-3: hsla(0, 0%, 99%, 1);
--sk-back-4: hsl(0, 0%, 95%);
--sk-back-5: hsl(0, 0%, 80%);
--sk-back-5: hsl(0, 0%, 92%);

--sk-text-1: hsla(0, 0%, 0%, 0.95);
--sk-text-2: hsla(0, 0%, 0%, 0.88);
Expand Down Expand Up @@ -94,7 +92,7 @@
--sk-back-2: hsl(0 0 18);
--sk-back-3: hsl(0 0 12);
--sk-back-4: hsl(0 0 22);
--sk-back-5: hsl(0 0 40);
--sk-back-5: hsl(0 0 25);
--sk-back-translucent: hsla(0, 0%, 100%, 0.1);
--sk-theme-1-hsl: 12, 94%, 62%;
--sk-theme-2-hsl: 240, 8%, 44%;
Expand Down
Loading