From 22550f13bd439cc7ce00f03d827327e80a57afe4 Mon Sep 17 00:00:00 2001 From: treecat Date: Thu, 2 Jun 2022 15:22:29 +0800 Subject: [PATCH] =?UTF-8?q?DESIGN-4069=20fix:=20=E5=B9=BD=E7=81=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E6=82=AC=E6=B5=AE=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/base/button/demo.button.js | 44 ++++++++++++++++++++++--- src/less/base/single/button/button.less | 8 ++--- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/demo/js/base/button/demo.button.js b/demo/js/base/button/demo.button.js index 45860ff70..6098389e7 100644 --- a/demo/js/base/button/demo.button.js +++ b/demo/js/base/button/demo.button.js @@ -193,6 +193,41 @@ Demo.Button = BI.inherit(BI.Widget, { ghost: true, height: 30 } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "warning", + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "error", + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "success", + height: 30 + } }, { el: { type: "bi.button", @@ -246,7 +281,7 @@ Demo.Button = BI.inherit(BI.Widget, { el: { type: "bi.button", text: "浅色的一般按钮", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { @@ -254,7 +289,7 @@ Demo.Button = BI.inherit(BI.Widget, { type: "bi.button", text: "浅色的成功按钮", level: "success", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { @@ -262,15 +297,16 @@ Demo.Button = BI.inherit(BI.Widget, { type: "bi.button", text: "浅色的警告按钮", level: "warning", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { el: { type: "bi.button", - iconCls: "close-font", + iconCls: "plus-font", text: "浅色的失败按钮", level: "error", + cls: "hover-mask", light: true } }]; diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index 6faa28452..f6f24bfa6 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -64,7 +64,7 @@ body .bi-button, #body .bi-button { &, & .b-font:before { color: @color-bi-text-common-ghost-button; } - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-hover-common-ghost-button; } @@ -136,7 +136,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-success-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-success-button; } @@ -181,7 +181,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-warning-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-warning-button; } @@ -226,7 +226,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-error-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-error-button; }