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/fui/fineui 

# Conflicts:
#	Gruntfile.js
#	dist/demo.js
es6
windy 7 years ago
parent
74f59611a0 f2e9ea77dd
commit
79a5c66392
13 changed files with 123 additions and 54 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. 3
      demo/app.js
  2. 3
      demo/version.js
  3. 26
      dist/bundle.css
  4. 2
      dist/bundle.min.css
  5. 3
      dist/config.js
  6. 26
      dist/fineui.css
  7. 2
      dist/fineui.min.css
  8. 26
      dist/resource.css
  9. 26
      public/css/icon.css
  10. 26
      src/css/resource/icon.css
  11. 6
      src/less/image.less
  12. 2
      src/less/resource/icon.less
  13. 26
      ui/css/icon.css

3
demo/app.js
Unescape View File

@ -1,3 +1,6 @@
Demo = {
version: 1.0
};
$(function () {
var ref;
var AppRouter = BI.inherit(BI.Router, {

3
demo/version.js
Unescape View File

@ -1,6 +1,3 @@
if (!window.BI) {
window.BI = {};
}
BI.servletURL = "";
BI.resourceURL = "resource/";
BI.i18n = {

26
dist/bundle.css vendored
Unescape View File

@ -6651,36 +6651,48 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.radio-icon:active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png');
_background: none;

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
dist/config.js vendored
Unescape View File

@ -1,6 +1,3 @@
if (!window.BI) {
window.BI = {};
}
BI.servletURL = "";
BI.resourceURL = "resource/";
BI.i18n = {

26
dist/fineui.css vendored
Unescape View File

@ -6651,36 +6651,48 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.radio-icon:active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png');
_background: none;

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

26
dist/resource.css vendored
Unescape View File

@ -1506,36 +1506,48 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.radio-icon:active .x-icon {
display: block;
background: url('images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable2.png');
_background: none;

26
public/css/icon.css
Unescape View File

@ -364,36 +364,48 @@
}
.radio-icon:active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png');
_background: none;

26
src/css/resource/icon.css
Unescape View File

@ -364,36 +364,48 @@
}
.radio-icon:active .x-icon {
display: block;
background: url('images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable2.png');
_background: none;

6
src/less/image.less
Unescape View File

@ -259,7 +259,7 @@
}
// 可自定义默认、悬浮、激活、选中、灰化、激活状态灰化状态
.icon_custom(@class, @iconPath, @hoverPath, @activePath, @selectPath, @disablePath, @activeDisablePath) when not (@activeDisablePath = none) {
.icon_custom(@class, @iconPath, @hoverPath, @activePath, @selectedPath, @disablePath, @activeDisablePath) when not (@activeDisablePath = none) {
.@{class} {
& .x-icon {
display: block;
@ -287,9 +287,9 @@
&.active .x-icon {
display: block;
.image2xPath(@selectPath, 0, 0);
.image2xPath(@selectedPath, 0, 0);
&.hack {
.imagePath(@selectPath, 0, 0);
.imagePath(@selectedPath, 0, 0);
}
}

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

@ -61,7 +61,7 @@
//CheckBox
.icon_custom(check-box-icon, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-active, @icon-checkbox-disable, @icon-checkbox-active-disable);
//Radio
.icon_custom(radio-icon, @icon-radio-normal, @icon-radio-normal, @icon-radio-normal @icon-radio-active, @icon-radio-disable, @icon-radio-active-disable);
.icon_custom(radio-icon, @icon-radio-normal, @icon-radio-normal, @icon-radio-normal, @icon-radio-active, @icon-radio-disable, @icon-radio-active-disable);
//Half Select
.icon(check-half-select-icon, @icon-half-select);

26
ui/css/icon.css
Unescape View File

@ -364,36 +364,48 @@
}
.radio-icon:active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/"icon/radio_normal.png" "icon/radio_active.png"') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/"icon/radio_normal.png" "icon/radio_active.png"');
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon.active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_active.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_active.png');
_background: none;
}
.radio-icon.disabled .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_disable.png');
background-size: contain;
_background: none;
}
.radio-icon.active .x-icon.hack {
.radio-icon.disabled .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_disable.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled .x-icon {
.radio-icon.disabled.active .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled .x-icon.hack {
.radio-icon.disabled.active .x-icon.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png');
_background: none;

Write Preview
Loading…
Cancel
Save