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

无JIRA任务 字体改一下

es6
windy 6 years ago
parent
0d2f803053
commit
146473ba2e
18 changed files with 172 additions and 55 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. 32
      dist/bundle.css
  2. 6
      dist/bundle.js
  3. 30
      dist/core.css
  4. 30
      dist/core_without_normalize.css
  5. 32
      dist/fineui.css
  6. 6
      dist/fineui.js
  7. 2
      dist/resource.css
  8. 6
      dist/widget.js
  9. 2
      public/css/app.css
  10. 30
      src/css/core/utils/common.css
  11. 2
      src/css/resource/app.css
  12. 37
      src/less/core/utils/common.less
  13. 2
      src/less/lib/colors.less
  14. 2
      src/less/resource/app.less
  15. 2
      src/widget/dynamicdate/dynamicdate.combo.js
  16. 2
      src/widget/timeinterval/dateinterval.js
  17. 2
      src/widget/timeinterval/timeinterval.js
  18. 2
      ui/css/app.css

32
dist/bundle.css vendored
Unescape View File

@ -360,23 +360,23 @@ textarea {
}
.bi-header-background {
background-color: #F2F4F7;
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-input {
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-textarea {
color: #3d4d66;
color: #647185;
}
.bi-theme-dark .bi-header-background {
background-color: #2F3149;
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-input {
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-textarea {
color: #d6e0dc;
color: #afb7c6;
}
.bi-card {
background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial {
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3793,7 +3811,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
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;

6
dist/bundle.js vendored
Unescape View File

@ -61274,7 +61274,7 @@ BI.extend(BI.DynamicDateCard, {
},
props: {
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
height: 22
},
@ -77146,7 +77146,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",
@ -77326,7 +77326,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",

30
dist/core.css vendored
Unescape View File

@ -360,23 +360,23 @@ textarea {
}
.bi-header-background {
background-color: #F2F4F7;
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-input {
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-textarea {
color: #3d4d66;
color: #647185;
}
.bi-theme-dark .bi-header-background {
background-color: #2F3149;
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-input {
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-textarea {
color: #d6e0dc;
color: #afb7c6;
}
.bi-card {
background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial {
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

30
dist/core_without_normalize.css vendored
Unescape View File

@ -79,23 +79,23 @@ textarea {
}
.bi-header-background {
background-color: #F2F4F7;
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-input {
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-textarea {
color: #3d4d66;
color: #647185;
}
.bi-theme-dark .bi-header-background {
background-color: #2F3149;
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-input {
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-textarea {
color: #d6e0dc;
color: #afb7c6;
}
.bi-card {
background-color: #ffffff;
@ -156,6 +156,24 @@ textarea {
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial {
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

32
dist/fineui.css vendored
Unescape View File

@ -360,23 +360,23 @@ textarea {
}
.bi-header-background {
background-color: #F2F4F7;
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-input {
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-textarea {
color: #3d4d66;
color: #647185;
}
.bi-theme-dark .bi-header-background {
background-color: #2F3149;
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-input {
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-textarea {
color: #d6e0dc;
color: #afb7c6;
}
.bi-card {
background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial {
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -3793,7 +3811,7 @@ body {
-o-user-select: none;
user-select: none;
color: #3d4d66;
font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
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;

6
dist/fineui.js vendored
Unescape View File

@ -61495,7 +61495,7 @@ BI.extend(BI.DynamicDateCard, {
},
props: {
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
height: 22
},
@ -77367,7 +77367,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",
@ -77547,7 +77547,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",

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 "Microsoft YaHei", "Hiragino Sans GB W3";
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;

6
dist/widget.js vendored
Unescape View File

@ -2864,7 +2864,7 @@ BI.extend(BI.DynamicDateCard, {
},
props: {
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
height: 22
},
@ -18736,7 +18736,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",
@ -18916,7 +18916,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",

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 "Microsoft YaHei", "Hiragino Sans GB W3";
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;

30
src/css/core/utils/common.css
Unescape View File

@ -79,23 +79,23 @@ textarea {
}
.bi-header-background {
background-color: #F2F4F7;
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-input {
color: #3d4d66;
color: #647185;
}
.bi-header-background .bi-textarea {
color: #3d4d66;
color: #647185;
}
.bi-theme-dark .bi-header-background {
background-color: #2F3149;
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-input {
color: #d6e0dc;
color: #afb7c6;
}
.bi-theme-dark .bi-header-background .bi-textarea {
color: #d6e0dc;
color: #afb7c6;
}
.bi-card {
background-color: #ffffff;
@ -156,6 +156,24 @@ textarea {
.bi-theme-dark .bi-border {
border: 1px solid #2F3149;
}
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial {
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

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 "Microsoft YaHei", "Hiragino Sans GB W3";
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;

37
src/less/core/utils/common.less
Unescape View File

@ -97,24 +97,24 @@ textarea {
.bi-header-background {
background-color: @color-bi-background-light-gray;
color: @color-bi-text-normal;
color: @color-bi-text-light-gray;
& .bi-input {
color: @color-bi-text-normal;
color: @color-bi-text-light-gray;
}
& .bi-textarea {
color: @color-bi-text-normal;
color: @color-bi-text-light-gray;
}
}
.bi-theme-dark {
.bi-header-background {
background-color: @color-bi-background-light-gray-theme-dark;
color: @color-bi-text-normal-theme-dark;
color: @color-bi-text-light-gray-theme-dark;
& .bi-input {
color: @color-bi-text-normal-theme-dark;
color: @color-bi-text-light-gray-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-normal-theme-dark;
color: @color-bi-text-light-gray-theme-dark;
}
}
}
@ -199,6 +199,31 @@ textarea {
}
}
// 字体
.bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-arial{
font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-PingFang {
font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
}
.bi-font-hiragino-sans {
font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
}
.bi-font-microsoft-yaHei {
font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
}
.bi-font-heiti {
font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
}
.bi-border-radius {
.border-radius(2px);
}

2
src/less/lib/colors.less
Unescape View File

@ -14,6 +14,8 @@
@color-bi-text-gray: @font-color-gray;
//浅灰色字体
@color-bi-text-light-gray: @font-color-light-gray;
//深色浅灰色字体
@color-bi-text-light-gray-theme-dark: @font-color-light-gray-theme-dark;
//白色字体颜色
@color-bi-text: @font-color-white;
//灰化字体颜色

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

@ -16,7 +16,7 @@ body {
background-repeat: repeat;
.user-select-disable();
color: @color-bi-text-normal;
font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
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;

2
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -9,7 +9,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
},
props: {
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
height: 22
},

2
src/widget/timeinterval/dateinterval.js
Unescape View File

@ -33,7 +33,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",

2
src/widget/timeinterval/timeinterval.js
Unescape View File

@ -33,7 +33,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
BI.createWidget({
element: self,
type: "bi.center",
hgap: 15,
hgap: 10,
height: this.constants.height,
items: [{
type: "bi.absolute",

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 "Microsoft YaHei", "Hiragino Sans GB W3";
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;

Write Preview
Loading…
Cancel
Save