Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

全局样式

master
guy 8 years ago
parent
adf4dec387
commit
e29a50a71d
7 changed files with 24 additions and 37 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. 8
      bi/base.js
  2. 8
      docs/base.js
  3. 8
      src/base/pane.js
  4. 12
      src/css/resource/font.css
  5. 12
      src/less/lib/colors.less
  6. 5
      src/less/lib/constant.less
  7. 8
      src/less/resource/font.less

8
bi/base.js
Unescape View File

@ -243,7 +243,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loading: function () { loading: function () {
var self = this, o = this.options; var self = this, o = this.options;
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Maskers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: 'bi.vtape', type: 'bi.vtape',
items: [{ items: [{
@ -253,10 +253,10 @@ BI.Pane = BI.inherit(BI.Widget, {
}, },
height: 30 height: 30
}], }],
element: BI.Maskers.make(this.getName(), this) element: BI.Layers.make(this.getName(), this)
}); });
} }
BI.Maskers.show(self.getName()); BI.Layers.show(self.getName());
} else if (BI.isNull(this._loading)) { } else if (BI.isNull(this._loading)) {
this._loading = BI.createWidget({ this._loading = BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -279,7 +279,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loaded: function () { loaded: function () {
var self = this, o = this.options; var self = this, o = this.options;
BI.Maskers.remove(self.getName()); BI.Layers.remove(self.getName());
this._loading && this._loading.destroy(); this._loading && this._loading.destroy();
this._loading && (this._loading = null); this._loading && (this._loading = null);
o.onLoaded(); o.onLoaded();

8
docs/base.js
Unescape View File

@ -243,7 +243,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loading: function () { loading: function () {
var self = this, o = this.options; var self = this, o = this.options;
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Maskers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: 'bi.vtape', type: 'bi.vtape',
items: [{ items: [{
@ -253,10 +253,10 @@ BI.Pane = BI.inherit(BI.Widget, {
}, },
height: 30 height: 30
}], }],
element: BI.Maskers.make(this.getName(), this) element: BI.Layers.make(this.getName(), this)
}); });
} }
BI.Maskers.show(self.getName()); BI.Layers.show(self.getName());
} else if (BI.isNull(this._loading)) { } else if (BI.isNull(this._loading)) {
this._loading = BI.createWidget({ this._loading = BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -279,7 +279,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loaded: function () { loaded: function () {
var self = this, o = this.options; var self = this, o = this.options;
BI.Maskers.remove(self.getName()); BI.Layers.remove(self.getName());
this._loading && this._loading.destroy(); this._loading && this._loading.destroy();
this._loading && (this._loading = null); this._loading && (this._loading = null);
o.onLoaded(); o.onLoaded();

8
src/base/pane.js
Unescape View File

@ -42,7 +42,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loading: function () { loading: function () {
var self = this, o = this.options; var self = this, o = this.options;
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Maskers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
type: 'bi.vtape', type: 'bi.vtape',
items: [{ items: [{
@ -52,10 +52,10 @@ BI.Pane = BI.inherit(BI.Widget, {
}, },
height: 30 height: 30
}], }],
element: BI.Maskers.make(this.getName(), this) element: BI.Layers.make(this.getName(), this)
}); });
} }
BI.Maskers.show(self.getName()); BI.Layers.show(self.getName());
} else if (BI.isNull(this._loading)) { } else if (BI.isNull(this._loading)) {
this._loading = BI.createWidget({ this._loading = BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -78,7 +78,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loaded: function () { loaded: function () {
var self = this, o = this.options; var self = this, o = this.options;
BI.Maskers.remove(self.getName()); BI.Layers.remove(self.getName());
this._loading && this._loading.destroy(); this._loading && this._loading.destroy();
this._loading && (this._loading = null); this._loading && (this._loading = null);
o.onLoaded(); o.onLoaded();

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

@ -411,7 +411,7 @@
.dot-ha-font:focus .b-font:before, .dot-ha-font:focus .b-font:before,
.dot-ha-font.hover .b-font:before { .dot-ha-font.hover .b-font:before {
content: "\e606"; content: "\e606";
color: #f4f4f4; color: #999999;
} }
.dot-ha-font:active .b-font:before, .dot-ha-font:active .b-font:before,
.dot-ha-font.active .b-font:before { .dot-ha-font.active .b-font:before {
@ -431,7 +431,7 @@
.dot-e-font:focus .b-font:before, .dot-e-font:focus .b-font:before,
.dot-e-font.hover .b-font:before { .dot-e-font.hover .b-font:before {
content: "\e606"; content: "\e606";
color: #f4f4f4; color: #999999;
} }
.dot-e-font.active .b-font:before { .dot-e-font.active .b-font:before {
content: "\e606"; content: "\e606";
@ -2242,12 +2242,12 @@
} }
.group-add-font .b-font:before { .group-add-font .b-font:before {
content: "\e649"; content: "\e649";
color: #808080; color: #999999;
} }
.group-add-font.native .b-font:before, .group-add-font.native .b-font:before,
.group-add-font.disabled .b-font:before { .group-add-font.disabled .b-font:before {
content: "\e649"; content: "\e649";
color: #808080; color: #999999;
} }
.sortable-font .b-font:before { .sortable-font .b-font:before {
content: "\e63b"; content: "\e63b";
@ -2642,7 +2642,7 @@
.data-link-check-font:focus .b-font:before, .data-link-check-font:focus .b-font:before,
.data-link-check-font.hover .b-font:before { .data-link-check-font.hover .b-font:before {
content: "\e611"; content: "\e611";
color: #f4f4f4; color: #999999;
} }
.data-link-check-font:active .b-font:before, .data-link-check-font:active .b-font:before,
.data-link-check-font.active .b-font:before { .data-link-check-font.active .b-font:before {
@ -2747,7 +2747,7 @@
.item-check-font:focus .b-font:before, .item-check-font:focus .b-font:before,
.item-check-font.hover .b-font:before { .item-check-font.hover .b-font:before {
content: "\e611"; content: "\e611";
color: #f4f4f4; color: #999999;
} }
.item-check-font:active .b-font:before, .item-check-font:active .b-font:before,
.item-check-font.active .b-font:before { .item-check-font.active .b-font:before {

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

@ -41,10 +41,6 @@
@color-bi-background-black: @background-color-black; @color-bi-background-black: @background-color-black;
//深灰色背景 //深灰色背景
@color-bi-background-dark: @background-color-dark; @color-bi-background-dark: @background-color-dark;
//浅灰色背景
@color-bi-background-gray: @background-color-active;
//浅色背景
@color-bi-background-light: @background-color-light;
//灰化背景 //灰化背景
@color-bi-background-disabled: @background-color-disabled; @color-bi-background-disabled: @background-color-disabled;
//成功背景色 //成功背景色
@ -71,10 +67,8 @@
//灰化分割线 //灰化分割线
@color-bi-split-disabled: @split-color-disabled; @color-bi-split-disabled: @split-color-disabled;
//基本边框色 //黑色边框色
@color-bi-border-black: @border-color-black; @color-bi-border-black: @border-color-black;
//基本边框色
@color-bi-border-normal: @border-color-normal;
//默认边框色 //默认边框色
@color-bi-border-default: @border-color-default; @color-bi-border-default: @border-color-default;
//outline颜色 //outline颜色
@ -115,10 +109,6 @@
//失败边框 //失败边框
@color-bi-tooltip-warning-border: @border-color-error; @color-bi-tooltip-warning-border: @border-color-error;
//dashboard
@color-dashboard-toolbar-border: @border-color-main;
@color-dashboard-toolbar-font: @font-color-light-gray;
//dimension //dimension
@color-dimension-background: @background-color-light-blue; @color-dimension-background: @background-color-light-blue;
@color-target-background: @background-color-light-green; @color-target-background: @background-color-light-green;

5
src/less/lib/constant.less
Unescape View File

@ -32,17 +32,15 @@
@font-color-orange: #fcc550; @font-color-orange: #fcc550;
//font-icon color //font-icon color
@icon-color-normal: #808080; @icon-color-normal: #999999;
@icon-color-active: #3f8ce8; @icon-color-active: #3f8ce8;
//background color //background color
@background-color-black: #1a1a1a;// @background-color-black: #1a1a1a;//
@background-color-light: #eaeaea;
@background-color-default: #ffffff;// @background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640;// @background-color-default-theme-dark: #242640;//
@background-color-normal: #eff1f4;// @background-color-normal: #eff1f4;//
@background-color-normal-theme-dark: #191B2B;// @background-color-normal-theme-dark: #191B2B;//
@background-color-active: #f4f4f4;
@background-color-highlight: #3f8ce8; @background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd; @background-color-dark: #d4dadd;
@background-color-disabled: #c4c6c6; @background-color-disabled: #c4c6c6;
@ -71,7 +69,6 @@
@border-color-normal: #d4dadd; @border-color-normal: #d4dadd;
@border-color-line: #d4dadd; @border-color-line: #d4dadd;
@border-color-line-theme-dark: #525466; @border-color-line-theme-dark: #525466;
@border-color-main: #d3d9dc;
@border-color-outline: #3f8ce8; @border-color-outline: #3f8ce8;
@border-color-highlight: #178cdf; @border-color-highlight: #178cdf;
@border-color-resize: #e85050; @border-color-resize: #e85050;

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

@ -39,8 +39,8 @@
//子菜单选中 //子菜单选中
.font(dot-font, @font-dot, @color-bi-text-black); .font(dot-font, @font-dot, @color-bi-text-black);
.font-hover(dot-h-font, @font-dot, @color-bi-text-black); .font-hover(dot-h-font, @font-dot, @color-bi-text-black);
.font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-black); .font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-black);
.font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight, @color-bi-text-black); .font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-highlight, @color-bi-text-black);
//向右展开子菜单 //向右展开子菜单
.font(pull-right-font, @font-right-triangle); .font(pull-right-font, @font-right-triangle);
@ -251,7 +251,7 @@
.font(add-new-table-pull-down-font, @font-down, @color-bi-text); .font(add-new-table-pull-down-font, @font-down, @color-bi-text);
.font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight); .font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-text-highlight);
//点击编辑 //点击编辑
.font-hover(edit-set-font, @font-detail-set); .font-hover(edit-set-font, @font-detail-set);
@ -264,7 +264,7 @@
.font-hover-active(folder-list-view, @font-classify, inherit, inherit, @color-bi-text); .font-hover-active(folder-list-view, @font-classify, inherit, inherit, @color-bi-text);
.font-hover-active(folder-card-view, @font-tile-view, inherit, inherit, @color-bi-text); .font-hover-active(folder-card-view, @font-tile-view, inherit, inherit, @color-bi-text);
.font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-font-active); .font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-font-active);
//表格上面的相关操作——升序、降序、不排序、过滤 //表格上面的相关操作——升序、降序、不排序、过滤
.font-hover(table-no-sort-no-filter-font, @font-no-sort-no-filter); .font-hover(table-no-sort-no-filter-font, @font-no-sort-no-filter);

Write Preview
Loading…
Cancel
Save