diff --git a/esbuild.config.mjs b/esbuild.config.mjs index cca8c8e0dc..74f92ba55e 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -1,6 +1,10 @@ +import path from 'node:path'; + import cleanPlugin from 'esbuild-plugin-clean'; import stylePlugin from 'esbuild-style-plugin'; +const nodeModules = path.resolve(process.cwd(), './node_modules'); + /** @type {import('esbuild').BuildOptions} */ export default { bundle: true, @@ -17,7 +21,10 @@ export default { generateScopedName: 'univer-[local]', }, renderOptions: { - lessOptions: { rewriteUrls: 'all' }, + lessOptions: { + rewriteUrls: 'all', + paths: [nodeModules], + }, }, }), ], diff --git a/examples/univer-doc-ts/esbuild.config.mjs b/examples/univer-doc-ts/esbuild.config.mjs index f8c250df7b..f9347d44b7 100644 --- a/examples/univer-doc-ts/esbuild.config.mjs +++ b/examples/univer-doc-ts/esbuild.config.mjs @@ -1,9 +1,13 @@ +import path from 'node:path'; + import esbuild from 'esbuild'; import cleanPlugin from 'esbuild-plugin-clean'; import copyPlugin from 'esbuild-plugin-copy'; import stylePlugin from 'esbuild-style-plugin'; import minimist from 'minimist'; +const nodeModules = path.resolve(process.cwd(), './node_modules'); + const args = minimist(process.argv.slice(2)); const ctx = await esbuild[args.watch ? 'context' : 'build']({ @@ -27,7 +31,10 @@ const ctx = await esbuild[args.watch ? 'context' : 'build']({ generateScopedName: 'univer-[local]', }, renderOptions: { - lessOptions: { rewriteUrls: 'all' }, + lessOptions: { + rewriteUrls: 'all', + paths: [nodeModules], + }, }, }), ], diff --git a/examples/univer-sheet-ts/esbuild.config.mjs b/examples/univer-sheet-ts/esbuild.config.mjs index a7695e8f86..ddb86290b9 100644 --- a/examples/univer-sheet-ts/esbuild.config.mjs +++ b/examples/univer-sheet-ts/esbuild.config.mjs @@ -1,9 +1,13 @@ +import path from 'node:path'; + import esbuild from 'esbuild'; import cleanPlugin from 'esbuild-plugin-clean'; import copyPlugin from 'esbuild-plugin-copy'; import stylePlugin from 'esbuild-style-plugin'; import minimist from 'minimist'; +const nodeModules = path.resolve(process.cwd(), './node_modules'); + const args = minimist(process.argv.slice(2)); const ctx = await esbuild[args.watch ? 'context' : 'build']({ @@ -27,7 +31,10 @@ const ctx = await esbuild[args.watch ? 'context' : 'build']({ generateScopedName: 'univer-[local]', }, renderOptions: { - lessOptions: { rewriteUrls: 'all' }, + lessOptions: { + rewriteUrls: 'all', + paths: [nodeModules], + }, }, }), ], diff --git a/examples/univer-slide-ts/esbuild.config.mjs b/examples/univer-slide-ts/esbuild.config.mjs index 8d60606936..c091cc123a 100644 --- a/examples/univer-slide-ts/esbuild.config.mjs +++ b/examples/univer-slide-ts/esbuild.config.mjs @@ -1,9 +1,13 @@ +import path from 'node:path'; + import esbuild from 'esbuild'; import cleanPlugin from 'esbuild-plugin-clean'; import copyPlugin from 'esbuild-plugin-copy'; import stylePlugin from 'esbuild-style-plugin'; import minimist from 'minimist'; +const nodeModules = path.resolve(process.cwd(), './node_modules'); + const args = minimist(process.argv.slice(2)); const ctx = await esbuild[args.watch ? 'context' : 'build']({ @@ -27,7 +31,10 @@ const ctx = await esbuild[args.watch ? 'context' : 'build']({ generateScopedName: 'univer-[local]', }, renderOptions: { - lessOptions: { rewriteUrls: 'all' }, + lessOptions: { + rewriteUrls: 'all', + paths: [nodeModules], + }, }, }), ], diff --git a/packages/base-ui/src/Components/Button/Style/index.module.less b/packages/base-ui/src/Components/Button/Style/index.module.less index 6195cea1cb..0647069dbd 100644 --- a/packages/base-ui/src/Components/Button/Style/index.module.less +++ b/packages/base-ui/src/Components/Button/Style/index.module.less @@ -24,6 +24,8 @@ &-text { .btn-text(); + line-height: 1; + &-active { color: var(--text-color); background: #eee; diff --git a/packages/base-ui/src/Components/Button/Style/mixin.less b/packages/base-ui/src/Components/Button/Style/mixin.less index da00f21964..b65e8546b1 100644 --- a/packages/base-ui/src/Components/Button/Style/mixin.less +++ b/packages/base-ui/src/Components/Button/Style/mixin.less @@ -54,21 +54,15 @@ } .btn-text() { - .button-color(var(--text-color), transparent, transparent); - line-height: 2; + .button-color(@text-color, transparent, transparent); border-radius: @border-radius-base; box-shadow: none; - &:hover { - color: var(--text-color); - background: #eee; - border-color: transparent; - } - + &:hover, &:active { - color: var(--text-color); - background: #eee; + color: @text-color; + background: @border-color; border-color: transparent; } .button-disabled(var(--disabled-color); transparent; transparent); @@ -105,7 +99,7 @@ } &-sm { - .button-size(24px, 7px, @font-size-sm, @border-radius-base) + .button-size(28px, 7px, @font-size-sm, @border-radius-base) } } @@ -135,7 +129,7 @@ } &.btn-sm { - .button-size(24px, (30px / 2), @font-size-sm, 24px); + .button-size(28px, (30px / 2), @font-size-sm, 28px); } } @@ -152,7 +146,7 @@ } &.btn-sm { - min-width: 24px; + min-width: 28px; border-radius: 50%; } } \ No newline at end of file diff --git a/packages/base-ui/src/Components/Slider/index.module.less b/packages/base-ui/src/Components/Slider/index.module.less index ed01e502b2..055ae39330 100644 --- a/packages/base-ui/src/Components/Slider/index.module.less +++ b/packages/base-ui/src/Components/Slider/index.module.less @@ -1,11 +1,11 @@ @import '../../Basics/CSS/Skin/default.module.less'; @slider-bg: @text-color-secondary; -@slider-width: 144px; +@slider-width: 116px; @slider-height: 4px; @slider-radius: 15px; -@slider-handle-size: 20px; +@slider-handle-size: 12px; @slider-value-width: 55px; @slider-value-height: 28px; diff --git a/packages/base-ui/src/Components/Tooltip/Tooltip.tsx b/packages/base-ui/src/Components/Tooltip/Tooltip.tsx index 20e05f4088..032c4c9e94 100644 --- a/packages/base-ui/src/Components/Tooltip/Tooltip.tsx +++ b/packages/base-ui/src/Components/Tooltip/Tooltip.tsx @@ -18,7 +18,6 @@ export const Tooltip = (props: ITooltipProps) => { overlay={
{typeof title === 'function' ? title() : title}
} builtinPlacements={placements} placement={placement} - mouseLeaveDelay={0.1} mouseEnterDelay={0.2} showArrow destroyTooltipOnHide diff --git a/packages/base-ui/src/views/app.module.less b/packages/base-ui/src/views/app.module.less index 6abdb50cbc..93abe8087e 100644 --- a/packages/base-ui/src/views/app.module.less +++ b/packages/base-ui/src/views/app.module.less @@ -2,14 +2,14 @@ .layout-container { // theme - background-color: var(--bg); - color: var(--text-color); + background-color: @bg-color; + color: @text-color; height: 100%; .content-container-horizontal { - display: flex; - min-height: 14em; position: relative; + min-height: 14em; + display: flex; .content-inner-left-container { // position: relative; @@ -30,6 +30,7 @@ .content-inner-right-container { width: 50%; + background-color: @bg-color-secondary; flex: 1; // position: relative; } diff --git a/packages/base-ui/src/views/app.tsx b/packages/base-ui/src/views/app.tsx index 6cf8fae967..fa4ef493af 100644 --- a/packages/base-ui/src/views/app.tsx +++ b/packages/base-ui/src/views/app.tsx @@ -10,7 +10,7 @@ import { Container } from '../Components/Container/Container'; import { IWorkbenchOptions } from '../controllers/ui/ui.controller'; import style from './app.module.less'; import { ContextMenu } from './components/contextmenu/contextmenu'; -import { Toolbar } from './components/toolbar/toolbar'; +import { DocBars } from './components/DocBars'; export interface IUniverAppProps extends IWorkbenchOptions { footerComponents?: Set<() => ComponentType>; @@ -95,7 +95,7 @@ export function App(props: IUniverAppProps) { {/* header */}
- {props.toolbar && } + {props.toolbar && }
{/* content */} @@ -123,7 +123,7 @@ export function App(props: IUniverAppProps) { {/* footer */} -