Skip to content

Commit f7c77c7

Browse files
committed
Merge branch 'master' into update-univer-and-dockview
# Conflicts: # src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/univer-sheet.bundle.css
2 parents bfcc860 + a8f98f5 commit f7c77c7

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>10.0.5</Version>
4+
<Version>10.0.6</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/univer-sheet.bundle.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
/*
2-
@import 'univerjs.preset-sheets-core/index.css';
3-
@import 'univerjs.preset-sheets-drawing/index.css';
4-
@import 'univerjs.sheets-zen-editor/index.css';
5-
@import 'univerjs.preset-sheets-data-validation/index.css';
6-
@import 'univerjs.preset-sheets-thread-comment/index.css';
7-
@import 'univerjs.preset-sheets-advanced/index.css';
8-
*/
91
@import 'univer-bundle.css';
102

113
.bb-univer-sheet {
@@ -14,10 +6,6 @@
146
overflow: hidden;
157
}
168

17-
/* .univer-fixed {
18-
position: absolute;
19-
} */
20-
219
.univer-theme {
2210
position: relative;
2311
z-index: 1200;

0 commit comments

Comments
 (0)