caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #543 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'c2d0fba0869a95f9d7a57be5059c2382dad7c83e':
  update
  BI-28404 小三角在深色系下的表现和幽灵按钮替换
es6
windy 7 years ago
parent
d077a940da c2d0fba086
commit
c6d200947c
19 changed files with 291839 additions and 291807 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      demo/js/base/button/demo.button.js
  2. 4
      dist/_fineui.min.js
  3. 44
      dist/base.css
  4. 73478
      dist/base.js
  5. 44
      dist/bundle.css
  6. 229162
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 2
      dist/bundle.min.js
  9. 4
      dist/case.js
  10. 1
      dist/demo.js
  11. 44
      dist/fineui.css
  12. 229660
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 4
      dist/fineui.min.js
  15. 51110
      dist/widget.js
  16. 4
      src/case/combo/bubblecombo/popup.bubble.js
  17. 44
      src/css/base/combo/combo.css
  18. 14
      src/less/base/combo/combo.bubble.less
  19. 22
      src/less/visual.less

1
demo/js/base/button/demo.button.js
Unescape View File

@ -225,6 +225,7 @@ Demo.Button = BI.inherit(BI.Widget, {
// });
return {
type: "bi.left",
scrolly: true,
vgap: 100,
hgap: 20,
items: items

4
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

44
dist/base.css vendored
Unescape View File

@ -345,14 +345,14 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: -5px;
margin-left: 3px;
margin-top: -3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-45deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
@ -364,14 +364,14 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 5px;
margin-left: 3px;
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1;
@ -388,9 +388,9 @@
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1;
@ -406,10 +406,16 @@
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640;
}
.bi-combo.bi-combo-popup {

73478
dist/base.js vendored
View File

File diff suppressed because it is too large Load Diff

44
dist/bundle.css vendored
Unescape View File

@ -2191,14 +2191,14 @@ textarea {
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: -5px;
margin-left: 3px;
margin-top: -3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-45deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
@ -2210,14 +2210,14 @@ textarea {
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 5px;
margin-left: 3px;
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1;
@ -2234,9 +2234,9 @@ textarea {
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1;
@ -2252,10 +2252,16 @@ textarea {
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640;
}
.bi-combo.bi-combo-popup {

229162
dist/bundle.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/case.js vendored
Unescape View File

@ -5472,7 +5472,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
_defaultConfig: function () {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view",
buttons: [{value: BI.i18nText("BI-Basic_Cancel"), level: "ignore"}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}]
buttons: [{value: BI.i18nText("BI-Basic_Cancel"), ghost: true}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}]
});
},
_init: function () {
@ -5546,7 +5546,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
ghost: true,
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);

1
dist/demo.js vendored
Unescape View File

@ -247,6 +247,7 @@ $(function () {
// });
return {
type: "bi.left",
scrolly: true,
vgap: 100,
hgap: 20,
items: items

44
dist/fineui.css vendored
Unescape View File

@ -2191,14 +2191,14 @@ textarea {
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: -5px;
margin-left: 3px;
margin-top: -3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-45deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
@ -2210,14 +2210,14 @@ textarea {
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 5px;
margin-left: 3px;
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1;
@ -2234,9 +2234,9 @@ textarea {
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1;
@ -2252,10 +2252,16 @@ textarea {
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640;
}
.bi-combo.bi-combo-popup {

229660
dist/fineui.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

51110
dist/widget.js vendored
View File

File diff suppressed because it is too large Load Diff

4
src/case/combo/bubblecombo/popup.bubble.js
Unescape View File

@ -82,7 +82,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
_defaultConfig: function () {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view",
buttons: [{value: BI.i18nText("BI-Basic_Cancel"), level: "ignore"}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}]
buttons: [{value: BI.i18nText("BI-Basic_Cancel"), ghost: true}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}]
});
},
_init: function () {
@ -156,7 +156,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
buttons: [{
type: "bi.button",
value: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
ghost: true,
height: 24,
handler: function () {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, false);

44
src/css/base/combo/combo.css
Unescape View File

@ -12,14 +12,14 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: -5px;
margin-left: 3px;
margin-top: -3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-45deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
@ -31,14 +31,14 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 5px;
margin-left: 3px;
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1;
@ -55,9 +55,9 @@
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1;
@ -73,10 +73,16 @@
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
transform: rotate(-135deg);
-webkit-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
box-shadow: 1px 1px 1px 0 rgba(35, 46, 64, 0.2);
}
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-theme-dark .bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640;
}
.bi-combo.bi-combo-popup {

14
src/less/base/combo/combo.bubble.less
Unescape View File

@ -8,21 +8,27 @@
& .bubble-combo-triangle-left {
z-index: 1;
.triangle-right();
//.solid-triangle-right(@color-bi-background-highlight);
}
& .bubble-combo-triangle-right {
z-index: 1;
.triangle-left();
//.solid-triangle-left(@color-bi-background-highlight);
}
& .bubble-combo-triangle-top {
z-index: 1;
.triangle-bottom();
//.solid-triangle-down(@color-bi-background-highlight);
}
& .bubble-combo-triangle-bottom {
z-index: 1;
.triangle-top();
//.solid-triangle-up(@color-bi-background-highlight);
}
}
.bi-theme-dark {
.bi-bubble-combo {
& .bubble-combo-triangle-left, &.bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom {
&:before {
background-color: @color-bi-background-default-theme-dark;
}
}
}
}

22
src/less/visual.less
Unescape View File

@ -198,8 +198,8 @@
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
.box-shadow(0 1px 5px 0, fade(#232E40, 20));
transform: rotate(-135deg);
.box-shadow(1px 1px 1px 0, fade(#232E40, 20));
}
}
@ -217,7 +217,7 @@
content: "";
background-color: #ffffff;
transform: rotate(45deg);
.box-shadow(0 1px 5px 0, fade(#232E40, 20));
.box-shadow(1px 1px 1px 0, fade(#232E40, 20));
}
}
@ -231,12 +231,12 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 5px;
margin-left: 3px;
margin-top: 3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
.box-shadow(0 1px 5px 0, fade(#232E40, 20));
transform: rotate(135deg);
.box-shadow(1px 1px 1px 0, fade(#232E40, 20));
}
}
@ -249,11 +249,11 @@
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: -5px;
margin-left: 3px;
margin-top: -3px;
content: "";
background-color: #ffffff;
transform: rotate(45deg);
.box-shadow(0 1px 5px 0, fade(#232E40, 20));
transform: rotate(-45deg);
.box-shadow(1px 1px 1px 0, fade(#232E40, 20));
}
}
Write Preview
Loading…
Cancel
Save