gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix bug grid + buttons' (#66) from dev-dungtv-0814 into dev

Browse Source 
Reviewed-on: #66
lgtm
This commit is contained in:
dev
2025-08-14 15:54:22 +09:00
parent 1a5ec4c6a3 c810139554
commit ed9150aae8
6 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/scss/common/button.scss
View File

@ -144,11 +144,10 @@
}
&.ant-btn-danger {
&.ant-btn-background-ghost {
color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
// background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important;
color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border");
background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
}
}

11
assets/scss/common/grid.scss
View File

@ -204,7 +204,7 @@
overflow: auto;
&::-webkit-scrollbar {
width: $scrollbar-width !important;
// width: $scrollbar-width !important;
height: $scrollbar-width !important;
-webkit-appearance: initial;
background-color: rgba(0, 0, 0, 0) !important;
@ -352,10 +352,11 @@
}
&.tui-grid-layer-editing {
background:map-deep-get($config,
#{$theme},
"tui-grid-cell-insert-color"
);
background: transparent;
// background:map-deep-get($config,
// #{$theme},
// "tui-grid-cell-insert-color"
// );
}
}
}

2
assets/scss/var.scss
View File

@ -166,7 +166,7 @@ $config: (
ant-btn-primary-color: #212224,
ant-btn-danger-bg:#D32029,
ant-btn-danger-border:#D32029,
ant-btn-danger-color:#D32029,
ant-btn-danger-color:#212224,
ant-btn-default-border:#FFFFFF2E,
ant-btn-default-bg:#FFFFFF2E,
ant-btn-default-color:#FFFFFFD9,