Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
张婷
forProjectBaseTemp
Commits
04a1533a
Commit
04a1533a
authored
1 year ago
by
vince
Browse files
Options
Download
Email Patches
Plain Diff
refactor: splitting and reorganizing style files
parent
414a639d
Changes
56
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
46 additions
and
49 deletions
+46
-49
.editorconfig
.editorconfig
+0
-3
.vscode/launch.json
.vscode/launch.json
+4
-0
.vscode/settings.json
.vscode/settings.json
+0
-1
apps/web-antd/src/bootstrap.ts
apps/web-antd/src/bootstrap.ts
+1
-0
internal/lint-configs/eslint-config/src/configs/perfectionist.ts
...l/lint-configs/eslint-config/src/configs/perfectionist.ts
+1
-1
internal/tailwind-config/package.json
internal/tailwind-config/package.json
+2
-0
packages/@core/shared/design-tokens/src/default/index.css
packages/@core/shared/design-tokens/src/default/index.css
+4
-0
packages/@core/shared/design/build.config.ts
packages/@core/shared/design/build.config.ts
+0
-22
packages/@core/shared/design/package.json
packages/@core/shared/design/package.json
+18
-12
packages/@core/shared/design/src/css/nprogress.css
packages/@core/shared/design/src/css/nprogress.css
+0
-0
packages/@core/shared/design/src/css/tailwind.css
packages/@core/shared/design/src/css/tailwind.css
+0
-0
packages/@core/shared/design/src/index.scss
packages/@core/shared/design/src/index.scss
+0
-1
packages/@core/shared/design/src/index.ts
packages/@core/shared/design/src/index.ts
+5
-0
packages/@core/shared/design/src/scss-bem/bem.scss
packages/@core/shared/design/src/scss-bem/bem.scss
+1
-1
packages/@core/shared/design/src/scss-bem/constants.scss
packages/@core/shared/design/src/scss-bem/constants.scss
+0
-0
packages/@core/shared/design/src/scss/base.scss
packages/@core/shared/design/src/scss/base.scss
+0
-5
packages/@core/shared/design/src/scss/index.scss
packages/@core/shared/design/src/scss/index.scss
+1
-1
packages/@core/shared/design/vite.config.mts
packages/@core/shared/design/vite.config.mts
+7
-0
packages/@core/ui-kit/menu-ui/src/components/normal-menu/normal-menu.vue
...ui-kit/menu-ui/src/components/normal-menu/normal-menu.vue
+1
-1
packages/@core/ui-kit/menu-ui/src/styles/index.scss
packages/@core/ui-kit/menu-ui/src/styles/index.scss
+1
-1
No files found.
.editorconfig
View file @
04a1533a
...
...
@@ -16,6 +16,3 @@ indent_size = 2
[*.md]
trim_trailing_whitespace = false
[Makefile]
indent_style = tab
This diff is collapsed.
Click to expand it.
.vscode/launch.json
View file @
04a1533a
{
"$schema"
:
"https://json.schemastore.org/launchsettings.json"
,
"version"
:
"0.2.0"
,
"configurations"
:
[
{
"type"
:
"chrome"
,
//
chrome、edge
"name"
:
"vben admin pro dev"
,
//
调试的名称,可以自定义
"request"
:
"launch"
,
"url"
:
"http://localhost:5173"
,
"env"
:
{
"NODE_ENV"
:
"development"
},
"sourceMaps"
:
true
,
"webRoot"
:
"${workspaceFolder}/apps/web-antd/src"
}
]
...
...
This diff is collapsed.
Click to expand it.
.vscode/settings.json
View file @
04a1533a
...
...
@@ -60,7 +60,6 @@
},
"files.exclude"
:
{
"**/.editorconfig"
:
true
,
"**/.eslintcache"
:
true
,
"**/bower_components"
:
true
,
"**/.turbo"
:
true
,
...
...
This diff is collapsed.
Click to expand it.
apps/web-antd/src/bootstrap.ts
View file @
04a1533a
import
{
createApp
}
from
'
vue
'
;
import
'
@vben/styles
'
;
import
'
@vben/styles/antd
'
;
import
{
preferences
}
from
'
@vben-core/preferences
'
;
import
{
loadMessages
,
setupI18n
}
from
'
#/locales
'
;
...
...
This diff is collapsed.
Click to expand it.
internal/lint-configs/eslint-config/src/configs/perfectionist.ts
View file @
04a1533a
...
...
@@ -26,7 +26,7 @@ export async function perfectionist(): Promise<Linter.FlatConfig[]> {
vue
:
'
vue
'
,
},
value
:
{
vben
:
[
'
@vben*
'
,
'
@vben/*
'
,
'
@vben-core/*
'
],
vben
:
[
'
@vben*
'
,
'
@vben/*
*/**
'
,
'
@vben-core/*
*/**
'
],
vue
:
[
'
vue
'
,
'
vue-*
'
,
'
@vue*
'
],
},
},
...
...
This diff is collapsed.
Click to expand it.
internal/tailwind-config/package.json
View file @
04a1533a
...
...
@@ -37,6 +37,8 @@
},
"./postcss"
:
{
"types"
:
"./src/postcss.config.ts"
,
"import"
:
"./dist/postcss.config.mjs"
,
"require"
:
"./dist/postcss.config.cjs"
,
"default"
:
"./dist/postcss.config.mjs"
},
"./*"
:
"./*"
...
...
This diff is collapsed.
Click to expand it.
packages/@core/shared/design-tokens/src/default/index.css
View file @
04a1533a
/* https://gavin-yyc.github.io/colorconvert/ */
:root
{
--font-geist-sans
:
'geist-sans'
,
-apple-system
,
blinkmacsystemfont
,
'Segoe UI'
,
roboto
,
helvetica
,
arial
,
sans-serif
,
'Apple Color Emoji'
,
'Segoe UI Emoji'
,
'Segoe UI Symbol'
;
/* Default background color of <body />...etc */
--background
:
0
0
100%
;
--foreground
:
210
6%
21%
;
...
...
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/build.config.ts
deleted
100644 → 0
View file @
414a639d
import
{
defineBuildConfig
}
from
'
unbuild
'
;
export
default
defineBuildConfig
({
clean
:
true
,
declaration
:
true
,
entries
:
[
{
builder
:
'
mkdist
'
,
input
:
'
./src
'
,
loaders
:
[
'
sass
'
],
outDir
:
'
./dist
'
,
pattern
:
[
'
index.scss
'
],
},
{
builder
:
'
mkdist
'
,
input
:
'
./src
'
,
loaders
:
[
'
postcss
'
],
outDir
:
'
./dist
'
,
pattern
:
[
'
tailwind.css
'
],
},
],
});
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/package.json
View file @
04a1533a
...
...
@@ -11,25 +11,31 @@
"license"
:
"MIT"
,
"type"
:
"module"
,
"scripts"
:
{
"build"
:
"pnpm unbuild"
,
"prepublishOnly"
:
"npm run build"
,
"stub"
:
"pnpm unbuild --stub"
"build"
:
"pnpm vite build"
,
"prepublishOnly"
:
"npm run build"
},
"files"
:
[
"dist"
,
"src"
],
"main"
:
"./dist/index.mjs"
,
"module"
:
"./dist/index.mjs"
,
"exports"
:
{
"."
:
{
"development"
:
"./src/scss/index.scss"
,
"default"
:
"./dist/index.css"
},
"./tailwind"
:
{
"development"
:
"./src/tailwind.css"
,
"default"
:
"./dist/tailwind.css"
"./bem"
:
{
"development"
:
"./src/scss-bem/bem.scss"
,
"default"
:
"./dist/bem.scss"
},
"./global"
:
{
"default"
:
"./src/scss/global.scss"
"."
:
{
"types"
:
"./src/index.ts"
,
"development"
:
"./src/index.ts"
,
"default"
:
"./dist/index.mjs"
}
},
"publishConfig"
:
{
"exports"
:
{
"."
:
{
"default"
:
"./dist/index.mjs"
}
}
},
"dependencies"
:
{
...
...
This diff is collapsed.
Click to expand it.
packages/
styles
/src/c
ommon
/nprogress.css
→
packages/
@core/shared/design
/src/c
ss
/nprogress.css
View file @
04a1533a
File moved
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/tailwind.css
→
packages/@core/shared/design/src/
css/
tailwind.css
View file @
04a1533a
File moved
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/index.scss
deleted
100644 → 0
View file @
414a639d
@import
'./scss/index'
;
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/index.ts
0 → 100644
View file @
04a1533a
import
'
./scss/index.scss
'
;
import
'
./css/tailwind.css
'
;
import
'
./css/nprogress.css
'
;
export
{};
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/scss
/global
.scss
→
packages/@core/shared/design/src/scss
-bem/bem
.scss
View file @
04a1533a
@forward
'./
common/
constants.scss'
;
@forward
'./constants.scss'
;
@mixin
b
(
$block
)
{
$B
:
$namespace
+
'-'
+
$block
!
global
;
...
...
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/scss
/common
/constants.scss
→
packages/@core/shared/design/src/scss
-bem
/constants.scss
View file @
04a1533a
File moved
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/scss/
common/
base.scss
→
packages/@core/shared/design/src/scss/base.scss
View file @
04a1533a
#app
,
.ant-app
,
body
,
html
{
width
:
100%
;
...
...
@@ -7,10 +6,6 @@ html {
overscroll-behavior
:
none
;
}
.ant-app
{
color
:
inherit
;
}
*,
:
:
after
,
::
before
{
...
...
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/src/scss/index.scss
View file @
04a1533a
/** css 样式重置 */
@import
'modern-normalize/modern-normalize.css'
;
@import
'./
common/
base'
;
@import
'./base'
;
@import
'./transition'
;
This diff is collapsed.
Click to expand it.
packages/@core/shared/design/vite.config.mts
0 → 100644
View file @
04a1533a
import { defineConfig } from '@vben/vite-config';
export default defineConfig({
vite: {
publicDir: 'src/scss-bem',
},
});
This diff is collapsed.
Click to expand it.
packages/@core/ui-kit/menu-ui/src/components/normal-menu/normal-menu.vue
View file @
04a1533a
...
...
@@ -58,7 +58,7 @@ function handleMouseenter(menu: MenuRecordRaw) {
</ul>
</template>
<
style
lang=
"scss"
scoped
>
@import
'@vben-core/design/
global
'
;
@import
'@vben-core/design/
bem
'
;
@include
b
(
'normal-menu'
)
{
--menu-item-margin-y
:
4px
;
...
...
This diff is collapsed.
Click to expand it.
packages/@core/ui-kit/menu-ui/src/styles/index.scss
View file @
04a1533a
@import
'@vben-core/design/
global
'
;
@import
'@vben-core/design/
bem
'
;
.
#{
$namespace
}
-menu__popup-container
,
.
#{
$namespace
}
-menu
{
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment