Browse Source

Pull request #1733: BI-77335 修改通用悬浮背景色

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'bd2c186696a39257f9ea6bb219fe7d8860a336fc':
  update
  无JIRA任务 补充属性
  BI-77335 修改通用悬浮背景色
es6
Kira 4 years ago
parent
commit
0cd9c5899d
  1. 4
      src/less/base/single/button/button.less
  2. 4
      src/less/core/utils/common.less
  3. 6
      src/widget/datepane/datepane.js
  4. 6
      src/widget/datetimepane/datetimepane.js

4
src/less/base/single/button/button.less

@ -228,7 +228,7 @@ body .bi-button, #body .bi-button {
.transition(@activeStopVal) .transition(@activeStopVal)
} }
&:hover{ &:hover{
background-color: @color-bi-blue-5; background-color: @color-bi-blue-10;
.transition(@hoverVal); .transition(@hoverVal);
} }
} }
@ -256,7 +256,7 @@ body .bi-button, #body .bi-button {
} }
&.button-ignore { &.button-ignore {
&:hover{ &:hover{
background-color: @color-bi-blue-5; background-color: @color-bi-blue-10;
} }
&:active{ &:active{
background-color: @color-bi-blue-10; background-color: @color-bi-blue-10;

4
src/less/core/utils/common.less

@ -519,7 +519,7 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text-black; color: @color-bi-text-black;
} }
.background-color(@color-bi-background-highlight, 5%); .background-color(@color-bi-background-highlight, 10%);
} }
&.disabled { &.disabled {
&, &:hover, &:active { &, &:hover, &:active {
@ -548,7 +548,7 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text; color: @color-bi-text;
} }
.background-color(@color-bi-background-highlight, 5%); .background-color(@color-bi-background-highlight, 10%);
} }
&.disabled { &.disabled {
&, &:hover, &:active { &, &:hover, &:active {

6
src/widget/datepane/datepane.js

@ -1,7 +1,9 @@
BI.DynamicDatePane = BI.inherit(BI.Widget, { BI.DynamicDatePane = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-dynamic-date-pane" baseCls: "bi-dynamic-date-pane",
minDate: "1900-01-01",
maxDate: "2099-12-31",
}, },
render: function () { render: function () {
@ -85,6 +87,8 @@ BI.DynamicDatePane = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.dynamic_date_card", type: "bi.dynamic_date_card",
min: o.minDate,
max: o.maxDate,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {

6
src/widget/datetimepane/datetimepane.js

@ -1,7 +1,9 @@
BI.DynamicDateTimePane = BI.inherit(BI.Widget, { BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-dynamic-date-pane" baseCls: "bi-dynamic-date-pane",
minDate: "1900-01-01",
maxDate: "2099-12-31",
}, },
render: function () { render: function () {
@ -84,6 +86,8 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
default: default:
return { return {
type: "bi.dynamic_date_card", type: "bi.dynamic_date_card",
min: o.minDate,
max: o.maxDate,
listeners: [{ listeners: [{
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",
action: function () { action: function () {

Loading…
Cancel
Save