Skip to content

Commit 42a4b0d

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into feature/AdminForth/1155/backend-validation-function-le
2 parents abf874b + 84830fa commit 42a4b0d

36 files changed

+889
-534
lines changed

adminforth/modules/styles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export const styles = () => ({
179179
lightCheckboxBgUnchecked: "alias:lightPrimaryContrast opacity:0.2", //checkbox unchecked state bg
180180
lightCheckboxBgChecked: "alias:lightPrimary", //cheched state bg
181181
lightCheckboxIconColor: "alias:lightPrimaryContrast lighten", //checked icon color
182-
lightCheckboxBorderColor: "alias:lightPrimary darken", //border color
182+
lightCheckboxBorderColor: "alias:lightListTableText", //border color
183183
lightFocusRing: "alias:lightPrimary lighten", //focus ring color
184184
lightTextLabel: "black", //text color of checkbox label
185185

@@ -532,7 +532,7 @@ export const styles = () => ({
532532
darkCheckboxBgUnchecked: "#374151",
533533
darkCheckboxBgChecked: "alias:darkPrimary",
534534
darkCheckboxIconColor: "alias:darkPrimaryContrast lighten",
535-
darkCheckboxBorderColor: "alias:darkPrimary darken",
535+
darkCheckboxBorderColor: "alias:darkListTableText",
536536
darkFocusRing: "alias:darkPrimary lighten",
537537
darkTextLabel: "white",
538538

adminforth/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"bin": {
1414
"adminforth": "./commands/cli.js"
1515
},
16+
"repository": {
17+
"type": "git",
18+
"url": "https://github.com/devforth/adminforth.git"
19+
},
1620
"scripts": {
1721
"test": "echo \"Error: no test specified yet\" && exit 1",
1822
"build": "rm -rf dist && tsc && pnpm prepareDist",
@@ -81,7 +85,7 @@
8185
"filewatcher": "^3.0.1",
8286
"fs-extra": "^11.2.0",
8387
"fuse.js": "^7.0.0",
84-
"handlebars": "^4.7.8",
88+
"handlebars": "^4.7.9",
8589
"inquirer": "^12.3.0",
8690
"jiti": "^2.4.2",
8791
"jsonwebtoken": "^9.0.2",

adminforth/pnpm-lock.yaml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/spa/package-lock.json

Lines changed: 44 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/spa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
"vue-diff": "^1.2.4",
3434
"vue-i18n": "^10.0.5",
3535
"vue-router": "^4.3.0",
36-
"vue-slider-component": "^4.1.0-beta.7",
3736
"vue3-json-viewer": "^2.2.2"
3837
},
3938
"devDependencies": {
4039
"@rushstack/eslint-patch": "^1.8.0",
4140
"@tailwindcss/typography": "^0.5.19",
4241
"@tsconfig/node20": "^20.1.4",
4342
"@types/node": "^20.12.5",
43+
"@types/sanitize-html": "^2.16.1",
4444
"@vitejs/plugin-vue": "^5.0.4",
4545
"@vue/eslint-config-typescript": "^13.0.0",
4646
"@vue/tsconfig": "^0.5.1",

0 commit comments

Comments
 (0)