fix: CSS from m3-components applied after project CSS causing unexpcted style in production
update: the primary color to #EE0000
This commit is contained in:
parent
493cf287f1
commit
6d78cbf41b
49
package.json
49
package.json
@ -1,24 +1,29 @@
|
||||
{
|
||||
"name": "cvsa",
|
||||
"version": "3.15.34",
|
||||
"private": false,
|
||||
"type": "module",
|
||||
"workspaces": [
|
||||
"packages/frontend",
|
||||
"packages/core",
|
||||
"packages/backend",
|
||||
"packages/crawler",
|
||||
"packages/solid"
|
||||
],
|
||||
"dependencies": {
|
||||
"arg": "^5.0.2",
|
||||
"postgres": "^3.4.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bun": "^1.2.15",
|
||||
"prettier": "^3.5.3",
|
||||
"vite-tsconfig-paths": "^5.1.4",
|
||||
"vitest": "^3.1.2",
|
||||
"vitest-tsconfig-paths": "^3.4.1"
|
||||
}
|
||||
"name": "cvsa",
|
||||
"version": "3.15.34",
|
||||
"private": false,
|
||||
"type": "module",
|
||||
"workspaces": [
|
||||
"packages/core",
|
||||
"packages/backend",
|
||||
"packages/crawler",
|
||||
"packages/solid"
|
||||
],
|
||||
"dependencies": {
|
||||
"arg": "^5.0.2",
|
||||
"postgres": "^3.4.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bun": "^1.2.15",
|
||||
"prettier": "^3.5.3",
|
||||
"vite-tsconfig-paths": "^5.1.4",
|
||||
"vitest": "^3.1.2",
|
||||
"vitest-tsconfig-paths": "^3.4.1"
|
||||
},
|
||||
"trustedDependencies": [
|
||||
"@parcel/watcher",
|
||||
"@tailwindcss/oxide",
|
||||
"onnxruntime-node",
|
||||
"protobufjs"
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
# SolidStart
|
||||
|
||||
Everything you need to build a Solid project, powered by [`solid-start`](https://start.solidjs.com);
|
||||
|
||||
## Creating a project
|
||||
|
||||
```bash
|
||||
# create a new project in the current directory
|
||||
npm init solid@latest
|
||||
|
||||
# create a new project in my-app
|
||||
npm init solid@latest my-app
|
||||
```
|
||||
|
||||
## Developing
|
||||
|
||||
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
|
||||
|
||||
```bash
|
||||
npm run dev
|
||||
|
||||
# or start the server and open the app in a new browser tab
|
||||
npm run dev -- --open
|
||||
```
|
||||
|
||||
## Building
|
||||
|
||||
Solid apps are built with _presets_, which optimise your project for deployment to different environments.
|
||||
|
||||
By default, `npm run build` will generate a Node app that you can run with `npm start`. To use a different preset, add it to the `devDependencies` in `package.json` and specify in your `app.config.js`.
|
||||
|
||||
## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)
|
||||
@ -14,6 +14,6 @@ export default defineConfig({
|
||||
jsxDev: true,
|
||||
jsxImportSource: "solid-js/h"
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
"luxon": "^3.7.1",
|
||||
"minimatch": "^10.0.3",
|
||||
"postgres": "^3.4.7",
|
||||
"solid-js": "^1.9.7",
|
||||
"solid-js": "^1.9.8",
|
||||
"tailwind-variants": "^1.0.0",
|
||||
"tailwindcss": "^4.1.11",
|
||||
"vinxi": "^0.5.8",
|
||||
@ -1264,7 +1264,7 @@
|
||||
|
||||
"smob": ["smob@1.5.0", "", {}, "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig=="],
|
||||
|
||||
"solid-js": ["solid-js@1.9.7", "", { "dependencies": { "csstype": "^3.1.0", "seroval": "~1.3.0", "seroval-plugins": "~1.3.0" } }, "sha512-/saTKi8iWEM233n5OSi1YHCCuh66ZIQ7aK2hsToPe4tqGm7qAejU1SwNuTPivbWAYq7SjuHVVYxxuZQNRbICiw=="],
|
||||
"solid-js": ["solid-js@1.9.8", "", { "dependencies": { "csstype": "^3.1.0", "seroval": "~1.3.0", "seroval-plugins": "~1.3.0" } }, "sha512-zF9Whfqk+s8wWuyDKnE7ekl+dJburjdZq54O6X1k4XChA57uZ5FOauYAa0s4I44XkBOM3CZmPrZC0DGjH9fKjQ=="],
|
||||
|
||||
"solid-refresh": ["solid-refresh@0.6.3", "", { "dependencies": { "@babel/generator": "^7.23.6", "@babel/helper-module-imports": "^7.22.15", "@babel/types": "^7.23.6" }, "peerDependencies": { "solid-js": "^1.3" } }, "sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA=="],
|
||||
|
||||
@ -1498,6 +1498,8 @@
|
||||
|
||||
"@isaacs/cliui/wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="],
|
||||
|
||||
"@m3-components/solid/solid-js": ["solid-js@1.9.7", "", { "dependencies": { "csstype": "^3.1.0", "seroval": "~1.3.0", "seroval-plugins": "~1.3.0" } }, "sha512-/saTKi8iWEM233n5OSi1YHCCuh66ZIQ7aK2hsToPe4tqGm7qAejU1SwNuTPivbWAYq7SjuHVVYxxuZQNRbICiw=="],
|
||||
|
||||
"@mapbox/node-pre-gyp/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],
|
||||
|
||||
"@netlify/zip-it-and-ship-it/@netlify/serverless-functions-api": ["@netlify/serverless-functions-api@2.1.2", "", {}, "sha512-uEFA0LAcBGd3+fgDSLkTTsrgyooKqu8mN/qA+F/COS2A7NFWRcLFnjVKH/xZhxq+oQkrSa+XPS9qj2wgQosiQw=="],
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{
|
||||
"name": "example-basic",
|
||||
"type": "module",
|
||||
"name": "solid",
|
||||
"scripts": {
|
||||
"dev": "vinxi dev --port 7400 --host",
|
||||
"build": "vinxi build",
|
||||
"start": "bun ../../node_modules/.bin/vinxi start --port 7400",
|
||||
"start": "bunx node-env-run --exec bun -- run vinxi start --port 7400",
|
||||
"version": "vinxi version"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -22,7 +21,7 @@
|
||||
"luxon": "^3.7.1",
|
||||
"minimatch": "^10.0.3",
|
||||
"postgres": "^3.4.7",
|
||||
"solid-js": "^1.9.7",
|
||||
"solid-js": "^1.9.8",
|
||||
"tailwind-variants": "^1.0.0",
|
||||
"tailwindcss": "^4.1.11",
|
||||
"vinxi": "^0.5.8"
|
||||
|
||||
@ -24,9 +24,9 @@
|
||||
--md-sys-color-shadow: #000000;
|
||||
--md-sys-color-scrim: #000000;
|
||||
--md-sys-color-surface-tint: #c00100;
|
||||
--md-sys-color-primary: #a50100;
|
||||
--md-sys-color-primary: #ee0000;
|
||||
--md-sys-color-on-primary: #ffffff;
|
||||
--md-sys-color-primary-container: #eb0000;
|
||||
--md-sys-color-primary-container: #ee0000;
|
||||
--md-sys-color-on-primary-container: #ffffff;
|
||||
--md-sys-color-inverse-primary: #ffb4a8;
|
||||
--md-sys-color-secondary: #b4271a;
|
||||
|
||||
@ -2,8 +2,8 @@ import { MetaProvider } from "@solidjs/meta";
|
||||
import { Router } from "@solidjs/router";
|
||||
import { FileRoutes } from "@solidjs/start/router";
|
||||
import { onMount, Suspense } from "solid-js";
|
||||
import "./app.css";
|
||||
import "@m3-components/solid/index.css";
|
||||
import "./app.css";
|
||||
import { setActiveTab, tabMap } from "./components/layout/Navigation";
|
||||
import { minimatch } from "minimatch";
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
import { Component } from "solid-js";
|
||||
import LogoLight from "/icons/zh/appbar_desktop_light.svg";
|
||||
import LogoDark from "/icons/zh/appbar_desktop_dark.svg";
|
||||
import { DynamicImage } from "~/components/utils/DynamicImage";
|
||||
import {
|
||||
AppBar,
|
||||
@ -16,7 +14,11 @@ export const NavigationDesktop: Component = () => {
|
||||
return (
|
||||
<AppBar class="hidden lg:flex h-20 xl:h-22 2xl:h-24" variant="search">
|
||||
<AppBarLeadingElement class="h-full grow shrink basis-0">
|
||||
<DynamicImage class="lg:block h-full" darkSrc={LogoDark} lightSrc={LogoLight} />
|
||||
<DynamicImage
|
||||
class="lg:block h-full"
|
||||
darkSrc="/icons/zh/appbar_desktop_dark.svg"
|
||||
lightSrc="/icons/zh/appbar_desktop_light.svg"
|
||||
/>
|
||||
</AppBarLeadingElement>
|
||||
<AppBarSearchContainer>
|
||||
<AppBarSearchBox class="mx-auto text-center" placeholder="搜索" />
|
||||
|
||||
@ -79,7 +79,7 @@ export default function Info() {
|
||||
</main>
|
||||
<div class="hidden lg:flex flex-col px-6">
|
||||
<div class="w-48 self-center 2xl:self-end flex justify-end mb-6">
|
||||
<ExtendedFAB position="unset" size="small" text="编辑" color="primary">
|
||||
<ExtendedFAB position="unset" size="small" elevation={false} text="编辑" color="primary">
|
||||
<EditIcon />
|
||||
</ExtendedFAB>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user