Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
This commit is contained in:
@ -144,7 +144,7 @@ a {
|
||||
|
||||
& .router-tab__container {
|
||||
overflow-y: auto;
|
||||
min-height: calc(100vh - 105px);
|
||||
height: calc(100vh - 105px);
|
||||
max-height: calc(100vh - 105px);
|
||||
padding: 20px;
|
||||
}
|
||||
@ -487,7 +487,7 @@ a {
|
||||
background-color: map-deep-get($config, #{$theme}, "container-fluid");
|
||||
|
||||
.menu-container {
|
||||
max-height: calc(100vh - 60px);
|
||||
height:calc(100vh - 60px);
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
@ -134,11 +134,11 @@
|
||||
}
|
||||
|
||||
&-body-container{
|
||||
border-right: 1px solid;
|
||||
border-right-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"tui-grid-cell-borderColor"
|
||||
);
|
||||
border-right: 0;
|
||||
// border-right-color: map-deep-get($config,
|
||||
// #{$theme},
|
||||
// "tui-grid-cell-borderColor"
|
||||
// );
|
||||
width: auto !important;
|
||||
}
|
||||
|
||||
@ -151,24 +151,27 @@
|
||||
width: $scrollbar-width !important;
|
||||
height: $scrollbar-width !important;
|
||||
-webkit-appearance: initial;
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"scrollbar-track"
|
||||
) !important;
|
||||
// background-color: map-deep-get($config,
|
||||
// #{$theme},
|
||||
// "tui-grid-cell-borderColor"
|
||||
// ) !important;
|
||||
background-color: rgba(0, 0, 0, 0) !important;
|
||||
border-radius: 3px !important;
|
||||
}
|
||||
|
||||
& ::-webkit-scrollbar-track {
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"scrollbar-track"
|
||||
) !important;
|
||||
// background-color: map-deep-get($config,
|
||||
// #{$theme},
|
||||
// "tui-grid-cell-borderColor"
|
||||
// ) !important;
|
||||
background-color: rgba(0, 0, 0, 0) !important;
|
||||
}
|
||||
|
||||
& ::-webkit-scrollbar-thumb {
|
||||
width: 50px !important;
|
||||
height: 50px !important;
|
||||
background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
|
||||
// background-color: rgba(0, 0, 0, 0);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
@ -195,6 +198,7 @@
|
||||
&-scrollbar-right-top {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
border: none;
|
||||
display: none;
|
||||
// background-color: map-deep-get(
|
||||
// $config,
|
||||
// #{$theme},
|
||||
@ -221,12 +225,13 @@
|
||||
width: $scrollbar-width !important;
|
||||
height: $scrollbar-width !important;
|
||||
// display: none !important;
|
||||
border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
|
||||
background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
|
||||
border-color: map-deep-get($config, #{$theme}, "cardBackground");
|
||||
background-color: map-deep-get($config, #{$theme}, "cardBackground");
|
||||
// border: none !important;
|
||||
// bottom: -1px;
|
||||
// right: -2px;
|
||||
box-sizing: border-box;
|
||||
// display: none;
|
||||
}
|
||||
|
||||
&-scrollbar-frozen-border,
|
||||
@ -236,13 +241,9 @@
|
||||
border-color: transparent !important;
|
||||
}
|
||||
|
||||
// &-body-area {
|
||||
// overflow: auto !important;
|
||||
// }
|
||||
|
||||
&-body-area,
|
||||
&-container,
|
||||
&-layer-state,
|
||||
&-body-area,
|
||||
&-summary-area,
|
||||
&-cell {
|
||||
background-color: map-deep-get($config,
|
||||
@ -254,23 +255,36 @@
|
||||
"tui-grid-border-vertical-color"
|
||||
);
|
||||
|
||||
&-current-row{
|
||||
td {
|
||||
.custom-radio {
|
||||
.radio-mark{
|
||||
border-color: #1677ff;
|
||||
background-color: #fff;
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
height: 11px;
|
||||
width: 11px;
|
||||
border-radius: 50%;
|
||||
background-color: #1677ff;
|
||||
}
|
||||
// &-current-row{
|
||||
// }
|
||||
td.row-selected {
|
||||
.custom-radio {
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"ant-btn-primary-color"
|
||||
);
|
||||
.radio-mark{
|
||||
border-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"arow-line-color"
|
||||
);
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"arow-line-btn-bg-color"
|
||||
);
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
height: 11px;
|
||||
width: 11px;
|
||||
border-radius: 50%;
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"arow-line-color"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -302,8 +316,8 @@
|
||||
&-header-area,
|
||||
&-cell-header {
|
||||
// font-family: inherit;
|
||||
// font-style: Semi Bold;
|
||||
font-weight: 600;
|
||||
font-style: Semi Bold;
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"tui-grid-header-backgroundColor"
|
||||
@ -320,8 +334,13 @@
|
||||
}
|
||||
|
||||
&-header-area {
|
||||
background-color: none;
|
||||
// background-color: none;
|
||||
border: none;
|
||||
margin-right: 0 !important;
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"tui-grid-cell-backgroundColor"
|
||||
);
|
||||
}
|
||||
|
||||
&-row-odd,
|
||||
|
@ -188,7 +188,7 @@
|
||||
transform: translateY(-50%);
|
||||
height: 18px;
|
||||
width: 18px;
|
||||
background-color: white;
|
||||
// background-color: white;
|
||||
border: 2px solid #ccc;
|
||||
border-radius: 50%;
|
||||
transition: all 0.2s ease;
|
||||
@ -263,9 +263,6 @@
|
||||
"v-input-backgroundColor"
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
&:not(.v-input--radio-group, .v-input--checkbox) {
|
||||
.v-input__slot {
|
||||
background-color: map-deep-get($config,
|
||||
@ -372,6 +369,17 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.radio-mark {
|
||||
background-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"ant-btn-primary-color"
|
||||
);
|
||||
border-color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"v-input-textarea-border"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
.v-radio {
|
||||
|
@ -14,11 +14,14 @@
|
||||
position: relative;
|
||||
border-radius: 6px;
|
||||
border: solid 1px;
|
||||
height: 40px;
|
||||
height: 32px;
|
||||
// border-color: #424242;
|
||||
border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
|
||||
|
||||
|
||||
&.datepicker-large {
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
.v-input {
|
||||
|
||||
// ----------------------
|
||||
|
@ -108,7 +108,7 @@ $config: (
|
||||
tui-grid-header-backgroundColor: #2a2b2d,
|
||||
tui-grid-header-color: #FFFFFFD9,
|
||||
tui-grid-border-horziontal-color: #212224,
|
||||
tui-grid-border-vertical-color: #212224,
|
||||
tui-grid-border-vertical-color: #FFFFFF0F,
|
||||
tui-grid-cell-backgroundColor: #212224,
|
||||
tui-grid-cell-color: #fff,
|
||||
tui-grid-cell-insert-color: #13636c,
|
||||
|
Reference in New Issue
Block a user