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

Merge pull request #411 in FUI/fineui from ~WINDY/fui:master to master 

* commit '9c9fed4d3860128bf11d7370c45f29149039c6b9':
  update
  font
es6
richie 7 years ago
parent
f5f87b8890 9c9fed4d38
commit
c476c23442
13 changed files with 101 additions and 33 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. 16
      dist/_fineui.min.js
  2. 11
      dist/bundle.css
  3. 2
      dist/bundle.min.css
  4. 30
      dist/bundle.min.js
  5. 11
      dist/fineui.css
  6. 2
      dist/fineui.min.css
  7. 16
      dist/fineui.min.js
  8. 11
      dist/resource.css
  9. 11
      public/css/font.css
  10. 11
      src/css/resource/font.css
  11. 1
      src/less/lib/font.less
  12. 1
      src/less/resource/font.less
  13. 11
      ui/css/font.css

16
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/bundle.css vendored
Unescape View File

@ -6087,6 +6087,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

30
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/fineui.css vendored
Unescape View File

@ -6087,6 +6087,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/resource.css vendored
Unescape View File

@ -872,6 +872,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

11
public/css/font.css
Unescape View File

@ -551,6 +551,17 @@
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

11
src/css/resource/font.css
Unescape View File

@ -551,6 +551,17 @@
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

1
src/less/lib/font.less
Unescape View File

@ -11,6 +11,7 @@
@font-solid-right: "e6d8"; @font-solid-right: "e6d8";
@font-solid-top: "e6d6"; @font-solid-top: "e6d6";
@font-solid-bottom: "e6d7"; @font-solid-bottom: "e6d7";
@font-up-triangle: "e70a";
@font-down-triangle: "e70b"; @font-down-triangle: "e70b";
@font-key: "e740"; @font-key: "e740";

1
src/less/resource/font.less
Unescape View File

@ -74,6 +74,7 @@
//单选下拉框 //单选下拉框
//向下展开子菜单 //向下展开子菜单
.font(pull-up-font, @font-up-triangle);
.font(pull-down-font, @font-down-triangle); .font(pull-down-font, @font-down-triangle);
.font-hover(pull-down-h-font, @font-down-triangle); .font-hover(pull-down-h-font, @font-down-triangle);
.font-hover-active(pull-down-ha-font, @font-down-triangle); .font-hover-active(pull-down-ha-font, @font-down-triangle);

11
ui/css/font.css
Unescape View File

@ -551,6 +551,17 @@
content: "\e64e"; content: "\e64e";
color: #999999; color: #999999;
} }
.pull-up-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-up-font .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-up-font.disabled .b-font:before {
content: "\e70a";
color: inherit;
}
.pull-down-font .b-font { .pull-down-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
} }

Write Preview
Loading…
Cancel
Save