Skip to content

Commit 486c23a

Browse files
baseplate-adminbaseplate-admin
committed
Run Prettier
1 parent 0515078 commit 486c23a

File tree

7 files changed

+156
-159
lines changed

7 files changed

+156
-159
lines changed

‎.github/workflows/merge.yml‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,34 @@ name: Merge
33
on: [push]
44

55
permissions:
6-
contents: write
7-
pull-requests: write
6+
contents: write
7+
pull-requests: write
88

99
jobs:
10-
'build-frontend':
11-
name: Build Frontend
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout Repo
15-
uses: actions/checkout@v4
16-
17-
- name: Install Node.JS
18-
uses: actions/setup-node@v4
19-
20-
- name: Install dependencies
21-
run: npm ci
22-
23-
- name: Build
24-
run: npm run build
25-
26-
27-
28-
merge:
29-
runs-on: ubuntu-latest
30-
needs: ['build-frontend']
31-
if: github.actor == 'dependabot[bot]' # Detect that the PR author is dependabot
32-
steps:
33-
- uses: actions/checkout@v4
34-
- name: Enable auto-merge for Dependabot PRs
35-
run: gh pr merge --auto --merge "$PR_URL" # Use Github CLI to merge automatically the PR
36-
env:
37-
PR_URL: ${{github.event.pull_request.html_url}}
38-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
39-
40-
10+
"build-frontend":
11+
name: Build Frontend
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repo
15+
uses: actions/checkout@v4
16+
17+
- name: Install Node.JS
18+
uses: actions/setup-node@v4
19+
20+
- name: Install dependencies
21+
run: npm ci
22+
23+
- name: Build
24+
run: npm run build
25+
26+
merge:
27+
runs-on: ubuntu-latest
28+
needs: ["build-frontend"]
29+
if: github.actor == 'dependabot[bot]' # Detect that the PR author is dependabot
30+
steps:
31+
- uses: actions/checkout@v4
32+
- name: Enable auto-merge for Dependabot PRs
33+
run: gh pr merge --auto --merge "$PR_URL" # Use Github CLI to merge automatically the PR
34+
env:
35+
PR_URL: ${{github.event.pull_request.html_url}}
36+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎postcss.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
22
plugins: {
3-
'@tailwindcss/postcss': {},
3+
"@tailwindcss/postcss": {}
44
}
55
};

‎src/global.css‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/* Tailwind */
22
@import "tailwindcss";
33

4-
@theme{
5-
--font-sans:"Kokoro","sans-serif";
6-
--font-mono:"Jetbrains Mono";
4+
@theme {
5+
--font-sans: "Kokoro", "sans-serif";
6+
--font-mono: "Jetbrains Mono";
77
}
88

99
@plugin "@tailwindcss/typography";
1010
@plugin "@tailwindcss/forms";
1111
@plugin "tailwind-scrollbar";
1212

13-
1413
/* Daisyui */
1514
@plugin "daisyui";
1615
@plugin "daisyui/theme" {
@@ -22,32 +21,32 @@
2221
/* --color-base-200: oklch(95% 0.03 240); */
2322
/* --color-base-300: oklch(92% 0.04 240); */
2423
/* --color-base-content: oklch(20% 0.05 240); */
25-
24+
2625
--color-primary: "#7569E1";
2726
/* --color-primary-content: oklch(98% 0.01 240); */
28-
27+
2928
--color-secondary: "#03020C";
3029
/* --color-secondary-content: oklch(98% 0.01 200); */
31-
32-
--color-accent:"#FFF7F8";
30+
31+
--color-accent: "#FFF7F8";
3332
/* --color-accent-content: oklch(98% 0.01 160); */
34-
33+
3534
--color-neutral: "#1E2036";
3635
/* --color-neutral-content: oklch(98% 0.01 240); */
37-
36+
3837
--color-info: "#DCD9F7";
3938
/* --color-info-content: oklch(98% 0.01 220); */
40-
39+
4140
--color-success: "#6FCF97";
4241
/* --color-success-content: oklch(98% 0.01 140); */
43-
42+
4443
--color-warning: "#EDD68D";
4544
/* --color-warning-content: oklch(20% 0.05 80); */
46-
45+
4746
--color-error: "#EB5757";
4847
/* --color-error-content: oklch(98% 0.01 30); */
49-
}
48+
}
5049

5150
html {
5251
@apply bg-black;
53-
}
52+
}

‎src/lib/components/pages/icons/icon-dialog.svelte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
<dialog bind:this={dialog_element} class="modal backdrop:bg-transparent">
3030
<div
31-
class="modal-box absolute bottom-5 h-max overflow-x-hidden bg-secondary p-0 md:bottom-10 md:max-w-max"
31+
class="modal-box bg-secondary absolute bottom-5 h-max overflow-x-hidden p-0 md:bottom-10 md:max-w-max"
3232
>
33-
<div class="flex w-full items-center bg-neutral/50 p-3">
33+
<div class="bg-neutral/50 flex w-full items-center p-3">
3434
<div class="flex flex-col gap-2 overflow-x-scroll">
3535
<div class="flex items-center gap-2">
3636
<div class="size-5">
@@ -41,7 +41,7 @@
4141
variant
4242
})}
4343
</div>
44-
<span class="text-lg font-semibold text-accent">
44+
<span class="text-accent text-lg font-semibold">
4545
{icon}
4646

4747
{#if variant}
@@ -65,7 +65,7 @@
6565
class="btn btn-primary btn-xs ml-auto">Copy</button
6666
>
6767
</div>
68-
<code class="w-full overflow-x-scroll rounded-xl bg-secondary/75 p-2 text-sm">
68+
<code class="bg-secondary/75 w-full overflow-x-scroll rounded-xl p-2 text-sm">
6969
<Highlight
7070
code={given_icon_name_return_html_string({
7171
icon_type: type,

‎src/routes/+layout.svelte‎

Lines changed: 100 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -12,112 +12,114 @@
1212
{@render children()}
1313
</main>
1414

15-
<style lang="scss" global>
16-
@font-face {
17-
font-family: "Kokoro";
18-
src: url("../fonts/Kokoro/Kokoro-SemiBoldItalic.woff2") format("woff2");
19-
font-weight: 600;
20-
font-style: italic;
21-
font-display: swap;
22-
}
23-
@font-face {
24-
font-family: "Kokoro";
25-
src: url("../fonts/Kokoro/Kokoro-SemiBold.woff2") format("woff2");
26-
font-weight: 600;
27-
font-style: normal;
28-
font-display: swap;
29-
}
30-
@font-face {
31-
font-family: "Kokoro";
32-
src: url("../fonts/Kokoro/Kokoro-BoldItalic.woff2") format("woff2");
33-
font-weight: bold;
34-
font-style: italic;
35-
font-display: swap;
36-
}
37-
@font-face {
38-
font-family: "Kokoro";
39-
src: url("../fonts/Kokoro/Kokoro-Italic.woff2") format("woff2");
40-
font-weight: normal;
41-
font-style: italic;
42-
font-display: swap;
43-
}
44-
@font-face {
45-
font-family: "Kokoro";
46-
src: url("../fonts/Kokoro/Kokoro-Regular.woff2") format("woff2");
47-
font-weight: normal;
48-
font-style: normal;
49-
font-display: swap;
50-
}
51-
@font-face {
52-
font-family: "Kokoro";
53-
src: url("../fonts/Kokoro/Kokoro-Bold.woff2") format("woff2");
54-
font-weight: bold;
55-
font-style: normal;
56-
font-display: swap;
57-
}
15+
<style lang="scss">
16+
:global {
17+
@font-face {
18+
font-family: "Kokoro";
19+
src: url("../fonts/Kokoro/Kokoro-SemiBoldItalic.woff2") format("woff2");
20+
font-weight: 600;
21+
font-style: italic;
22+
font-display: swap;
23+
}
24+
@font-face {
25+
font-family: "Kokoro";
26+
src: url("../fonts/Kokoro/Kokoro-SemiBold.woff2") format("woff2");
27+
font-weight: 600;
28+
font-style: normal;
29+
font-display: swap;
30+
}
31+
@font-face {
32+
font-family: "Kokoro";
33+
src: url("../fonts/Kokoro/Kokoro-BoldItalic.woff2") format("woff2");
34+
font-weight: bold;
35+
font-style: italic;
36+
font-display: swap;
37+
}
38+
@font-face {
39+
font-family: "Kokoro";
40+
src: url("../fonts/Kokoro/Kokoro-Italic.woff2") format("woff2");
41+
font-weight: normal;
42+
font-style: italic;
43+
font-display: swap;
44+
}
45+
@font-face {
46+
font-family: "Kokoro";
47+
src: url("../fonts/Kokoro/Kokoro-Regular.woff2") format("woff2");
48+
font-weight: normal;
49+
font-style: normal;
50+
font-display: swap;
51+
}
52+
@font-face {
53+
font-family: "Kokoro";
54+
src: url("../fonts/Kokoro/Kokoro-Bold.woff2") format("woff2");
55+
font-weight: bold;
56+
font-style: normal;
57+
font-display: swap;
58+
}
5859
59-
@font-face {
60-
font-family: "JetBrains Mono";
61-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-BoldItalic.woff2") format("woff2");
62-
font-weight: 700;
63-
font-style: italic;
64-
font-display: swap;
65-
}
60+
@font-face {
61+
font-family: "JetBrains Mono";
62+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-BoldItalic.woff2") format("woff2");
63+
font-weight: 700;
64+
font-style: italic;
65+
font-display: swap;
66+
}
6667
67-
@font-face {
68-
font-family: "JetBrains Mono";
69-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Bold.woff2") format("woff2");
70-
font-weight: 700;
71-
font-style: normal;
72-
font-display: swap;
73-
}
68+
@font-face {
69+
font-family: "JetBrains Mono";
70+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Bold.woff2") format("woff2");
71+
font-weight: 700;
72+
font-style: normal;
73+
font-display: swap;
74+
}
7475
75-
@font-face {
76-
font-family: "JetBrains Mono";
77-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-ExtraBoldItalic.woff2") format("woff2");
78-
font-weight: 800;
79-
font-style: italic;
80-
font-display: swap;
81-
}
76+
@font-face {
77+
font-family: "JetBrains Mono";
78+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-ExtraBoldItalic.woff2") format("woff2");
79+
font-weight: 800;
80+
font-style: italic;
81+
font-display: swap;
82+
}
8283
83-
@font-face {
84-
font-family: "JetBrains Mono";
85-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-ExtraBold.woff2") format("woff2");
86-
font-weight: 800;
87-
font-style: normal;
88-
font-display: swap;
89-
}
84+
@font-face {
85+
font-family: "JetBrains Mono";
86+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-ExtraBold.woff2") format("woff2");
87+
font-weight: 800;
88+
font-style: normal;
89+
font-display: swap;
90+
}
9091
91-
@font-face {
92-
font-family: "JetBrains Mono";
93-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Italic.woff2") format("woff2");
92+
@font-face {
93+
font-family: "JetBrains Mono";
94+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Italic.woff2") format("woff2");
9495
95-
font-weight: 400;
96-
font-style: italic;
97-
font-display: swap;
98-
}
96+
font-weight: 400;
97+
font-style: italic;
98+
font-display: swap;
99+
}
99100
100-
@font-face {
101-
font-family: "JetBrains Mono";
102-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-MediumItalic.woff2") format("woff2");
103-
font-weight: 500;
104-
font-style: italic;
105-
font-display: swap;
106-
}
101+
@font-face {
102+
font-family: "JetBrains Mono";
103+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-MediumItalic.woff2") format("woff2");
104+
font-weight: 500;
105+
font-style: italic;
106+
font-display: swap;
107+
}
107108
108-
@font-face {
109-
font-family: "JetBrains Mono";
110-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Medium.woff2") format("woff2");
111-
font-weight: 500;
112-
font-style: normal;
113-
font-display: swap;
114-
}
109+
@font-face {
110+
font-family: "JetBrains Mono";
111+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Medium.woff2") format("woff2");
112+
font-weight: 500;
113+
font-style: normal;
114+
font-display: swap;
115+
}
115116
116-
@font-face {
117-
font-family: "JetBrains Mono";
118-
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Regular.woff2") format("woff2");
119-
font-weight: 400;
120-
font-style: normal;
121-
font-display: swap;
117+
@font-face {
118+
font-family: "JetBrains Mono";
119+
src: url("../fonts/Jetbrains\ Mono/JetBrainsMono-Regular.woff2") format("woff2");
120+
font-weight: 400;
121+
font-style: normal;
122+
font-display: swap;
123+
}
122124
}
123125
</style>

‎src/routes/icons/+layout.svelte‎

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

1111
<div class="relative h-dvh w-full overflow-y-scroll">
1212
<header
13-
class="container sticky top-0 z-10 flex items-center justify-between bg-secondary/90 px-3 py-4 backdrop-blur md:h-16 md:px-3 md:py-0"
13+
class="bg-secondary/90 sticky top-0 z-10 container flex items-center justify-between px-3 py-4 backdrop-blur md:h-16 md:px-3 md:py-0"
1414
>
1515
<div class="flex items-center gap-2">
1616
<a aria-label="Logo" href="/">

0 commit comments

Comments
 (0)