Skip to content

Commit

Permalink
Merge pull request #140 from DTStack/beta-2.0.0-zhaoge
Browse files Browse the repository at this point in the history
Beta 2.0.0 zhaoge
  • Loading branch information
xigua-Jn authored Aug 8, 2022
2 parents 156fa21 + 1b3f2b8 commit c4b4572
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 5 deletions.
29 changes: 24 additions & 5 deletions theme/dt-theme/default/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
}
.ant-btn-danger.ant-btn:hover {
color: @white;
background-color: @red2 !important;
border-color: @red2;
background-color: #ED5340 !important;
border-color: #ED5340;
}
.ant-btn-danger.ant-btn:active,
.ant-btn-danger.ant-btn.active {
Expand All @@ -131,16 +131,22 @@
border-color: @red;
}
.ant-btn-background-ghost.ant-btn-danger:hover, .ant-btn-background-ghost.ant-btn-danger:focus {
color: @white;
background-color: @red2 !important;
border-color: @red2;
color: @red;
border-color: @red;
background-color: @white !important;
}
.ant-btn-background-ghost.ant-btn-danger:active,
.ant-btn-background-ghost.ant-btn-danger.active {
color: @white;
background-color: @red !important;
border-color: @red;
}
.ant-btn.ant-btn-default.ant-btn-background-ghost.dt-btn-custom-icon:not([disabled]){
&:hover{
color: @primaryColor;
border-color: @primaryColor;
}
}

.ant-btn-danger-disabled,
.ant-btn-danger.disabled,
Expand Down Expand Up @@ -239,3 +245,16 @@
margin-top: 2px;
}
}
.ant-btn.ant-btn-default:not([disabled]), .ant-btn.ant-btn-default.ant-btn-background-ghost:not([disabled]){
&:hover{
border-color: @hoverColor;
color: @hoverColor;
background-color: @white !important;
}
}
.ant-btn.ant-btn-default.dt-btn-highlight:not([disabled]){
&:hover{
color: @primaryColor;
border-color: @primaryColor;
}
}
3 changes: 3 additions & 0 deletions theme/dt-theme/default/input.less
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@
}
.ant-input-search > .ant-input-group > .ant-input-group-addon:last-child .ant-input-search-button:not(.ant-btn-primary){
border: solid 1px #D8DAE1;
&:hover{
border: solid 1px @primaryColor;
}
}

0 comments on commit c4b4572

Please sign in to comment.