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

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~zhenfei.li/fineui 

# Conflicts:
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
Zhenfei.Li 6 years ago
parent
07325d390e d68de05a51
commit
264baf812d
11 changed files with 71 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/bundle.css
  2. 2
      dist/bundle.min.css
  3. 2
      dist/fineui.css
  4. 30
      dist/fineui.ie.min.js
  5. 2
      dist/fineui.min.css
  6. 30
      dist/fineui.min.js
  7. 2
      dist/resource.css
  8. 2
      public/css/app.css
  9. 2
      src/css/resource/app.css
  10. 2
      src/less/resource/app.less
  11. 2
      ui/css/app.css

2
dist/bundle.css vendored
Unescape View File

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

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored
Unescape View File

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

30
dist/fineui.ie.min.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

30
dist/fineui.min.js 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; -o-user-select: none;
user-select: none; user-select: none;
color: #3d4d66; color: #3d4d66;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman"; font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-decoration: none; text-decoration: none;

2
public/css/app.css
Unescape View File

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

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

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

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

@ -16,7 +16,7 @@ body {
background-repeat: repeat; background-repeat: repeat;
.user-select-disable(); .user-select-disable();
color: @color-bi-text-normal; color: @color-bi-text-normal;
font: normal 12px "Microsoft YaHei", "PingFangSC-Light", SimHei, SimSun, FangSong, KaiTi, Arial, Tahoma, Verdana, "Times New Roman"; font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-decoration: none; text-decoration: none;

2
ui/css/app.css
Unescape View File

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

Write Preview
Loading…
Cancel
Save