Skip to content

Commit 5f33564

Browse files
committed
Merge branch 'master' into pr-13512
2 parents 39bb114 + 6c7dde9 commit 5f33564

199 files changed

Lines changed: 3384 additions & 835 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.storybook/manager-head.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
<link rel="preconnect" href="https://fonts.googleapis.com">
77
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
88
<link href="https://fonts.googleapis.com/css2?family=Lexend:wght@400;500;600;700&family=Source+Code+Pro:wght@400;500&display=swap" rel="stylesheet">
9+
10+
<link rel="stylesheet" href="manager-head.css">

.storybook/manager.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ const theme = create({
66
base: 'light',
77
brandTitle: 'Statamic UI Components',
88
brandUrl: 'https://statamic.dev',
9-
brandImage: '/logo.png',
9+
brandImage: '/logo.svg',
1010
fontBase: '"Lexend", sans-serif',
11-
fontCode: '"Source Code Pro", monospace'
11+
fontCode: '"Source Code Pro", monospace',
12+
13+
appBorderColor: 'hsl(287deg 80% 90%)',
14+
textColor: '#181a1b',
1215
});
1316

1417
addons.setConfig({

.storybook/preview-head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<link rel="preconnect" href="https://use.typekit.net" crossorigin>
77
<link rel="preconnect" href="https://p.typekit.net" crossorigin>
8-
<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css"/>
8+
<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css">
99

1010
<link rel="preconnect" href="https://fonts.googleapis.com">
1111
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

.storybook/preview.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import PortalVue from 'portal-vue';
1313
import FullscreenHeader from '@/components/publish/FullscreenHeader.vue';
1414
import Portal from '@/components/portals/Portal.vue';
1515
import PortalTargets from '@/components/portals/PortalTargets.vue';
16-
import { portals, stacks } from '@api';
16+
import {keys, portals, slug, stacks} from '@api';
1717

1818
// Intercept Inertia navigation and log to Actions tab.
1919
router.on('before', (event) => {
@@ -31,6 +31,11 @@ setup(async (app) => {
3131
linkToDocs: true,
3232
paginationSize: 50,
3333
paginationSizeOptions: [10, 25, 50, 100, 500],
34+
sites: [{
35+
handle: 'default',
36+
lang: 'en',
37+
}],
38+
selectedSite: 'default',
3439
};
3540

3641
return config[key] ?? null;
@@ -53,6 +58,8 @@ setup(async (app) => {
5358
app.config.globalProperties.cp_url = (url) => url;
5459
app.config.globalProperties.$portals = portals;
5560
app.config.globalProperties.$stacks = stacks;
61+
app.config.globalProperties.$slug = slug;
62+
app.config.globalProperties.$keys = keys;
5663

5764
app.use(PortalVue, { portalName: 'v-portal' });
5865

@@ -77,6 +84,7 @@ const preview: Preview = {
7784
base: 'light',
7885
fontBase: '"Lexend", sans-serif',
7986
fontCode: '"Source Code Pro", monospace',
87+
textColor: '#181a1b',
8088
}),
8189
source: {
8290
transform: (code: string) => cleanCodeSnippet(code),

.storybook/public/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

.storybook/public/manager-head.css

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
:root {
2+
--color-purple-light-1: hsl(256deg 60% 85%);
3+
--color-purple: hsl(256deg 70% 55%);
4+
}
5+
6+
/* GROUP SIDEBAR
7+
=================================================== */
8+
.sidebar-container {
9+
.sidebar-item {
10+
--tree-node-background-hover: hsl(256deg 60% 90%)!important;
11+
}
12+
[data-selected="true"],
13+
[data-selected="true"] *,
14+
[data-selected="true"] *:hover {
15+
background: var(--color-purple-light-1)!important;
16+
background: var(--color-purple)!important;
17+
box-shadow: none!important;
18+
outline: none;
19+
}
20+
[data-selected="true"] {
21+
border-radius: 10px;
22+
@supports (corner-shape: squircle) {
23+
border-radius: 50px;
24+
corner-shape: squircle;
25+
}
26+
}
27+
}
28+
29+
/* GROUP TOPBAR
30+
=================================================== */
31+
.sb-bar {
32+
/* Theme Selector */
33+
[id*="select-"] {
34+
background: hsl(256deg 60% 96%);
35+
color: var(--color-purple);
36+
}
37+
button {
38+
&:hover {
39+
color: var(--color-purple);
40+
background: hsl(256deg 60% 93%);
41+
}
42+
}
43+
}
44+
/* This is the best we can do, there are no other hooks */
45+
[aria-label="Theme selector"] {
46+
[role="option"] {
47+
&[aria-selected="true"] {
48+
color: var(--color-purple);
49+
}
50+
&:hover {
51+
color: var(--color-purple);
52+
background: hsl(256deg 60% 96%);
53+
}
54+
}
55+
}

0 commit comments

Comments
 (0)