Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/skeletonlabs/skeleton into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
endigo9740 committed Apr 25, 2023
2 parents 1aacddc + 3aafc22 commit df01ba8
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 9 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
"./src/lib/themes/*",
"!./dist/**/*.test.*"
],
"svelte": "./dist/index.js",
"typesVersions": {
">4.0": {
"index": [
Expand Down
8 changes: 4 additions & 4 deletions src/docs/layouts/DocsShell/DocsShell.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
// Partials
import Header from '$docs/layouts/DocsShell/partials/Header.svelte';
import PanelProps from '$docs/layouts/DocsShell/partials/PanelProps.svelte';
import PanelParams from './partials/PanelParams.svelte';
import PanelSlots from './partials/PanelSlots.svelte';
import PanelClasses from './partials/PanelClasses.svelte';
import PanelEvents from './partials/PanelEvents.svelte';
import PanelKeyboard from './partials/PanelKeyboard.svelte';
import PanelParams from './partials/PanelParams.svelte';
import PanelSlots from './partials/PanelSlots.svelte';
// Utilities
import { docSellDefaults } from '$docs/layouts/DocsShell/defaults';
import { docShellDefaults } from '$docs/layouts/DocsShell/defaults';
// Props
export let settings: DocsShellSettings;
Expand All @@ -34,7 +34,7 @@
// Page Data
const pageData: DocsShellSettings = {
// Define defaults first
...docSellDefaults,
...docShellDefaults,
// Local Overrides
...{ docsPath: $page.url.pathname },
// Prop Settings Values
Expand Down
2 changes: 1 addition & 1 deletion src/docs/layouts/DocsShell/defaults.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DocsFeature, type DocsShellSettings } from '$docs/layouts/DocsShell/types';

export let docSellDefaults: DocsShellSettings = {
export let docShellDefaults: DocsShellSettings = {
// Heading
feature: DocsFeature.Component,
name: '(name)',
Expand Down
2 changes: 2 additions & 0 deletions src/lib/components/InputChip/InputChip.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@
class="input-chip-field {classesInputField}"
on:input={onInputHandler}
on:input
on:focus
on:blur
disabled={$$restProps.disabled}
/>
</form>
Expand Down
1 change: 1 addition & 0 deletions src/lib/styles/core.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

::-webkit-scrollbar {
@apply w-2;
@apply h-2;
}
::-webkit-scrollbar-track {
@apply !bg-surface-50-900-token px-[1px];
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(inner)/docs/introduction/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<iframe
class="w-full aspect-video mx-auto rounded-container-token shadow"
src="https://www.youtube.com/embed/2OnJYCXJPK4"
src="https://www.youtube.com/embed/P_A0qQ7AuK8"
title="YouTube video player"
frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
Expand Down
4 changes: 2 additions & 2 deletions src/routes/(inner)/docs/tokens/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
const tableText: TableSource = {
head: headings,
body: [
['<code>.font-heading-token</code>', '', "Implements your theme's configured heading text size."],
['<code>.font-token</code>', '', "Implements your theme's configured base text size."],
['<code>.font-heading-token</code>', '', "Implements your theme's configured heading font family."],
['<code>.font-token</code>', '', "Implements your theme's configured base font family."],
['<code>.text-token</code>', '', "Implements your theme's configured base text color."],
['<code>.text-on-[color]-token</code>', vColorsAll, 'Provides an accessible foreground color.'],
['<code>.text-[color]-[pairings]-token</code>', `${vColorsAll}<br>${vPairings}`, descPairings]
Expand Down
6 changes: 6 additions & 0 deletions src/routes/(inner)/utilities/toasts/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@ const t: ToastSettings = {
/>
</svelte:fragment>
</DocsPreview>
<h3>Positioning</h3>
<p>
Skeleton takes an opinionated stance on positioning, preferring to keep toast notifications in fixed location on your page. This
position can be modified globally the <code>position</code> property on the Toast component. However, we do not allow you to modify this
per toast instance as we feel this would provide inconsistent UX.
</p>
</section>
<section class="space-y-4">
<h2>Callbacks</h2>
Expand Down

0 comments on commit df01ba8

Please sign in to comment.