Skip to content

Commit 63ee13a

Browse files
authored
More css tweaks (#753)
* tweaks * various fixes * more * redundant * accommodate prettier * prettier
1 parent f5d9c60 commit 63ee13a

File tree

20 files changed

+35
-254
lines changed

20 files changed

+35
-254
lines changed

apps/svelte.dev/src/lib/components/SecondaryNav.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
justify-content: space-between;
1818
padding: 0.6rem var(--sk-page-padding-side);
1919
background-color: var(--sk-bg-2);
20-
color: var(--sk-fg-1);
20+
color: var(--sk-fg-2);
2121
white-space: nowrap;
2222
flex: 0;
2323
gap: 1rem;

apps/svelte.dev/src/routes/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script>
2-
import { Footer } from '@sveltejs/site-kit/home';
32
import { Section } from '@sveltejs/site-kit/components';
43
import Hero from './_home/Hero.svelte';
54
import Supporters from './_home/Supporters/index.svelte';
65
import Testimonials from './_home/Testimonials.svelte';
76
import Companies from './_home/Companies.svelte';
87
import Video from './_home/Video.svelte';
98
import Community from './_home/Community.svelte';
9+
import Footer from './_home/Footer.svelte';
1010
</script>
1111

1212
<svelte:head>

packages/site-kit/src/lib/home/Footer.svelte renamed to apps/svelte.dev/src/routes/_home/Footer.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import Section from '../components/Section.svelte';
2+
import { Section } from '@sveltejs/site-kit/components';
33
</script>
44

55
<Section>

apps/svelte.dev/src/routes/tutorial/[...slug]/Chrome.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
border: 1px solid var(--sk-border);
7878
/* TODO this should apply to all buttons/inputs? */
7979
border-radius: var(--sk-border-radius);
80-
color: var(--sk-fg-1);
80+
color: var(--sk-fg-2);
8181
font: var(--sk-font-ui-medium);
8282
height: 3.2rem;
8383
}

apps/svelte.dev/src/routes/tutorial/[...slug]/Controls.svelte

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,4 @@
9797
padding: 0 1rem;
9898
font: var(--sk-font-ui-small);
9999
}
100-
101-
option:disabled {
102-
color: var(--sk-fg-1);
103-
font-weight: bold;
104-
}
105100
</style>

apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Item.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
142142
input {
143143
background: var(--sk-bg-1);
144-
color: var(--sk-fg-1) !important;
144+
color: var(--sk-fg-2) !important;
145145
margin: 0 0.5rem 0 calc(0.5rem + var(--inset));
146146
border: 2px solid transparent;
147147
padding: 0 0.5rem;

packages/editor/src/lib/codemirror.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@
110110
}
111111

112112
.cm-tooltip.cm-tooltip-autocomplete {
113-
color: var(--sk-fg-2) !important;
113+
color: var(--sk-fg-3) !important;
114114
perspective: 1px;
115115

116116
& > ul > li[aria-selected] {
117117
background-color: var(--sk-bg-4);
118-
color: var(--sk-fg-1) !important;
118+
color: var(--sk-fg-2) !important;
119119
}
120120

121121
& > ul {
@@ -126,7 +126,7 @@
126126
.cm-panels {
127127
font: var(--sk-font-ui-small);
128128
background: var(--sk-bg-2);
129-
color: var(--sk-fg-1);
129+
color: var(--sk-fg-2);
130130

131131
&.cm-panels-top,
132132
&.cm-panels-bottom {
@@ -178,7 +178,7 @@
178178
.cm-textfield {
179179
font: inherit;
180180
background: inherit;
181-
color: var(--sk-fg-1);
181+
color: inherit;
182182
border: 1px solid var(--sk-border);
183183
border-radius: var(--sk-border-radius);
184184
margin: 0;

packages/repl/src/lib/Output/Output.svelte

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
{#if workspace.current.name.endsWith('.md')}
8888
<button class="active">Markdown</button>
8989
{:else}
90-
<button class:active={view === 'result'} onclick={() => (view = 'result')}>Result</button>
91-
<button class:active={view === 'js'} onclick={() => (view = 'js')}>JS output</button>
92-
<button class:active={view === 'css'} onclick={() => (view = 'css')}>CSS output</button>
93-
<button class:active={view === 'ast'} onclick={() => (view = 'ast')}>AST output</button>
90+
<button aria-current={view === 'result'} onclick={() => (view = 'result')}>Result</button>
91+
<button aria-current={view === 'js'} onclick={() => (view = 'js')}>JS output</button>
92+
<button aria-current={view === 'css'} onclick={() => (view = 'css')}>CSS output</button>
93+
<button aria-current={view === 'ast'} onclick={() => (view = 'ast')}>AST output</button>
9494
{/if}
9595
</div>
9696

@@ -170,13 +170,12 @@
170170
border: none;
171171
border-bottom: 1px solid transparent;
172172
padding: 0 1rem;
173-
color: var(--sk-fg-2, #999);
173+
color: var(--sk-fg-2);
174174
border-radius: 0;
175-
}
176175
177-
button.active {
178-
border-bottom: 1px solid var(--sk-fg-accent, --prime);
179-
color: var(--sk-fg-1, #333);
176+
&[aria-current='true'] {
177+
border-bottom: 1px solid var(--sk-fg-accent);
178+
}
180179
}
181180
182181
div[slot] {

packages/repl/src/lib/Output/PaneWithPanel.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
display: flex;
6161
justify-content: space-between;
6262
align-items: center;
63-
padding: 0 0.5em;
63+
padding: 0.5rem 0.5rem 0.5rem 1rem;
6464
cursor: pointer;
6565
}
6666
@@ -71,7 +71,7 @@
7171
.panel-heading {
7272
font: var(--sk-font-ui-small);
7373
text-transform: uppercase;
74-
color: var(--sk-fg-1);
74+
color: var(--sk-fg-2);
7575
flex: 1;
7676
text-align: left;
7777
}

packages/repl/src/lib/Output/Viewer.svelte

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
</div>
302302

303303
<div slot="panel-header">
304-
<button on:click|stopPropagation={clear_logs}>
304+
<button class="raised" disabled={logs.length === 0} on:click|stopPropagation={clear_logs}>
305305
{#if logs.length > 0}
306306
({logs.length})
307307
{/if}
@@ -347,14 +347,16 @@
347347
opacity: 0.25;
348348
}
349349
350+
/* TODO this stuff should live in global styles */
350351
button {
351352
color: var(--sk-fg-2);
352353
font: var(--sk-font-ui-small);
353354
text-transform: uppercase;
354355
display: block;
356+
padding: 0.3rem 0.8rem;
355357
356-
&:hover {
357-
color: var(--sk-fg-1);
358+
&:disabled {
359+
color: var(--sk-fg-4);
358360
}
359361
}
360362

0 commit comments

Comments
 (0)