fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #731 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master 

* commit '13468f619f95da2240fb897811475d41cfcbb8f0':
  BI-33796 属于BI-32833的后续补充修改，调整body的font-family顺序，使windows点击苹方显示微软雅黑，mac相反
es6
Zhenfei.Li 6 years ago
parent
5f5a414fee 13468f619f
commit
569d725a8f
9 changed files with 146 additions and 146 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. 80
      dist/bundle.css
  2. 2
      dist/bundle.min.css
  3. 80
      dist/fineui.css
  4. 2
      dist/fineui.min.css
  5. 2
      dist/resource.css
  6. 2
      public/css/app.css
  7. 2
      src/css/resource/app.css
  8. 120
      src/less/resource/app.less
  9. 2
      ui/css/app.css

80
dist/bundle.css vendored
Unescape View File

@ -1590,7 +1590,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-horizontal-layout {
display: box;
/* OLD - Android 4.4- */
@ -1661,7 +1661,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-vertical-center {
display: box;
/* OLD - Android 4.4- */
@ -1738,7 +1738,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1782,7 +1782,7 @@ textarea {
min-height: 100%;
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1852,7 +1852,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1937,7 +1937,7 @@ textarea {
vertical-align: middle;
content: ' ';
}
.bi-inline-vertical-adapt-layout:after {
display: inline-block;
width: 0;
@ -1961,7 +1961,7 @@ textarea {
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -2453,7 +2453,7 @@ textarea {
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
}
.bi-combo.bi-combo-popup {
display: block !important;
visibility: visible !important;
@ -2476,7 +2476,7 @@ textarea {
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
@ -2493,20 +2493,20 @@ textarea {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-check-combo.bi-combo-popup > .bi-border,
.bi-text-value-check-combo:hover > .bi-border {
border-color: #3685f2;
}
.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
.bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2;
@ -2523,7 +2523,7 @@ textarea {
.bi-search-editor .search-font {
font-size: 16px;
}
/*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor {
font-size: 12px;
@ -2594,14 +2594,14 @@ textarea {
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;
}
.bi-direction-pager .direction-pager-next {
font-size: 16px;
}
.bi-pager .page-item {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3158,12 +3158,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost .b-font:before {
color: #ffffff !important;
}
.bi-single-select-icon-text-item:active .b-font:before,
.bi-single-select-icon-text-item.active .b-font:before {
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;
@ -3198,18 +3198,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor {
text-align: right;
cursor: pointer;
font-size: 100px;
z-index: 2;
}
.bi-textarea-editor {
overflow: hidden;
overflow-x: hidden;
@ -3293,11 +3293,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background: #feeed7;
color: #faaa39;
}
.bi-tip {
position: fixed !important;
}
.bi-toast {
color: #ffffff;
max-width: 400px;
@ -3321,7 +3321,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-toast .toast-icon {
font-size: 16px;
}
.bi-tooltip {
max-width: 250px;
-webkit-border-radius: 2px;
@ -3341,7 +3341,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;
}
.bi-display-tree .ztree * {
color: #999999;
}
@ -3594,8 +3594,8 @@ ul.ztree.zTreeDragUL {
padding:0;
background:none;
}*/
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
@ -3611,13 +3611,13 @@ ul.ztree.zTreeDragUL {
.bi-combo-popup > .bi-trigger .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-small-select-text-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3689,7 +3689,7 @@ ul.ztree.zTreeDragUL {
.bi-interval-slider-label {
min-height: 50px;
}
.bi-interval-slider {
min-height: 50px;
}
@ -3707,7 +3707,7 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-check-pane .multi-select-check-selected {
text-decoration: underline;
}
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3716,7 +3716,7 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3725,8 +3725,8 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
@ -3750,7 +3750,7 @@ ul.ztree.zTreeDragUL {
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
@ -3851,7 +3851,7 @@ ul.ztree.zTreeDragUL {
.bi-single-slider-label {
min-height: 50px;
}
.bi-single-slider-normal {
min-height: 30px;
}
@ -3998,7 +3998,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

80
dist/fineui.css vendored
Unescape View File

@ -1590,7 +1590,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-horizontal-layout {
display: box;
/* OLD - Android 4.4- */
@ -1661,7 +1661,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-vertical-center {
display: box;
/* OLD - Android 4.4- */
@ -1738,7 +1738,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1782,7 +1782,7 @@ textarea {
min-height: 100%;
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1852,7 +1852,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1937,7 +1937,7 @@ textarea {
vertical-align: middle;
content: ' ';
}
.bi-inline-vertical-adapt-layout:after {
display: inline-block;
width: 0;
@ -1961,7 +1961,7 @@ textarea {
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -2453,7 +2453,7 @@ textarea {
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
}
.bi-combo.bi-combo-popup {
display: block !important;
visibility: visible !important;
@ -2476,7 +2476,7 @@ textarea {
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
@ -2493,20 +2493,20 @@ textarea {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-check-combo.bi-combo-popup > .bi-border,
.bi-text-value-check-combo:hover > .bi-border {
border-color: #3685f2;
}
.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
.bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2;
@ -2523,7 +2523,7 @@ textarea {
.bi-search-editor .search-font {
font-size: 16px;
}
/*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor {
font-size: 12px;
@ -2594,14 +2594,14 @@ textarea {
.bi-all-count-pager .all-pager-next {
font-size: 16px;
}
.bi-direction-pager .direction-pager-prev {
font-size: 16px;
}
.bi-direction-pager .direction-pager-next {
font-size: 16px;
}
.bi-pager .page-item {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3158,12 +3158,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost .b-font:before {
color: #ffffff !important;
}
.bi-single-select-icon-text-item:active .b-font:before,
.bi-single-select-icon-text-item.active .b-font:before {
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;
@ -3198,18 +3198,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor {
text-align: right;
cursor: pointer;
font-size: 100px;
z-index: 2;
}
.bi-textarea-editor {
overflow: hidden;
overflow-x: hidden;
@ -3293,11 +3293,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background: #feeed7;
color: #faaa39;
}
.bi-tip {
position: fixed !important;
}
.bi-toast {
color: #ffffff;
max-width: 400px;
@ -3321,7 +3321,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-toast .toast-icon {
font-size: 16px;
}
.bi-tooltip {
max-width: 250px;
-webkit-border-radius: 2px;
@ -3341,7 +3341,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;
}
.bi-display-tree .ztree * {
color: #999999;
}
@ -3594,8 +3594,8 @@ ul.ztree.zTreeDragUL {
padding:0;
background:none;
}*/
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
@ -3611,13 +3611,13 @@ ul.ztree.zTreeDragUL {
.bi-combo-popup > .bi-trigger .trigger-down {
display: none;
}
.bi-select-text-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-small-select-text-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3689,7 +3689,7 @@ ul.ztree.zTreeDragUL {
.bi-interval-slider-label {
min-height: 50px;
}
.bi-interval-slider {
min-height: 50px;
}
@ -3707,7 +3707,7 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-check-pane .multi-select-check-selected {
text-decoration: underline;
}
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3716,7 +3716,7 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3725,8 +3725,8 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
@ -3750,7 +3750,7 @@ ul.ztree.zTreeDragUL {
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
@ -3851,7 +3851,7 @@ ul.ztree.zTreeDragUL {
.bi-single-slider-label {
min-height: 50px;
}
.bi-single-slider-normal {
min-height: 30px;
}
@ -3998,7 +3998,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
Unescape View File

@ -18,7 +18,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

2
public/css/app.css
Unescape View File

@ -18,7 +18,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

2
src/css/resource/app.css
Unescape View File

@ -18,7 +18,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

120
src/less/resource/app.less
Unescape View File

@ -1,61 +1,61 @@
@import "../index";
html {
height: 100%;
overflow: hidden;
}
body {
position: absolute;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
top: 0;
left: 0;
background-repeat: repeat;
.user-select-disable();
color: @color-bi-text-normal;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;
-kthml-user-focus: normal;
-moz-user-focus: normal;
-moz-outline: 0 none;
outline: 0 none;
}
div, textarea {
&::-webkit-scrollbar {
-webkit-appearance: none;
.background-color(@scroll-color, 5%);
width: 6px;
height: 6px;
}
&::-webkit-scrollbar-thumb {
.border-radius(0);
.background-color(@scroll-color, 30%);
&:hover {
.background-color(@scroll-color, 70%);
}
}
}
.bi-theme-dark {
div, textarea {
&::-webkit-scrollbar {
-webkit-appearance: none;
.background-color(@scroll-color-theme-dark, 5%);
width: 6px;
height: 6px;
}
&::-webkit-scrollbar-thumb {
.border-radius(0);
.background-color(@scroll-color-theme-dark, 30%);
&:hover {
.background-color(@scroll-color-theme-dark, 70%);
}
}
}
@import "../index";
html {
height: 100%;
overflow: hidden;
}
body {
position: absolute;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
top: 0;
left: 0;
background-repeat: repeat;
.user-select-disable();
color: @color-bi-text-normal;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;
-kthml-user-focus: normal;
-moz-user-focus: normal;
-moz-outline: 0 none;
outline: 0 none;
}
div, textarea {
&::-webkit-scrollbar {
-webkit-appearance: none;
.background-color(@scroll-color, 5%);
width: 6px;
height: 6px;
}
&::-webkit-scrollbar-thumb {
.border-radius(0);
.background-color(@scroll-color, 30%);
&:hover {
.background-color(@scroll-color, 70%);
}
}
}
.bi-theme-dark {
div, textarea {
&::-webkit-scrollbar {
-webkit-appearance: none;
.background-color(@scroll-color-theme-dark, 5%);
width: 6px;
height: 6px;
}
&::-webkit-scrollbar-thumb {
.border-radius(0);
.background-color(@scroll-color-theme-dark, 30%);
&:hover {
.background-color(@scroll-color-theme-dark, 70%);
}
}
}
}

2
ui/css/app.css
Unescape View File

@ -18,7 +18,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-decoration: none;

Write Preview
Loading…
Cancel
Save