resolve conflict
This commit is contained in:
@ -92,10 +92,13 @@
|
||||
background: map-deep-get($config, #{$theme}, "basic-button-background");
|
||||
}
|
||||
|
||||
.search-button {
|
||||
color: map-deep-get($config, #{$theme}, "search-btn-color");
|
||||
.searchFilter{
|
||||
.search-button {
|
||||
height: 40px;
|
||||
color: map-deep-get($config, #{$theme}, "search-btn-color");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.v-dialog {
|
||||
.ant-btn-icon-only {
|
||||
color: map-deep-get(
|
||||
@ -135,6 +138,15 @@
|
||||
background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
|
||||
}
|
||||
}
|
||||
|
||||
&.expand-btn {
|
||||
.v-icon {
|
||||
color: map-deep-get($config, #{$theme}, "basic-button-color");
|
||||
svg {
|
||||
fill: map-deep-get($config, #{$theme}, "basic-button-color");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -161,4 +173,13 @@
|
||||
height: 16px;
|
||||
background:none;
|
||||
}
|
||||
}
|
||||
}
|
||||
.ant-btn {
|
||||
&.expand-btn {
|
||||
.v-icon {
|
||||
span {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user