Browse Source

Merge pull request #101 in FUI/fineui from ~GUY/fineui:master to master

* commit 'd4666986852570d9d3aac77b130491eafbd77bf4':
  label加1
es6
guy 7 years ago
parent
commit
b8cfd1c031
  1. 8
      bi/base.css
  2. 8
      dist/base.css
  3. 8
      dist/bundle.css
  4. 7
      src/css/base/single/label.css
  5. 1
      src/css/base/single/text.css
  6. 6
      src/less/base/single/label.less
  7. 1
      src/less/base/single/text.less

8
bi/base.css

@ -866,6 +866,13 @@ li.CodeMirror-hint-active {
border: none;
color: #e85050 !important;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;
overflow-y: hidden;
white-space: nowrap;
word-break: break-all;
}
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-text {
@ -881,6 +888,7 @@ li.CodeMirror-hint-active {
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble {

8
dist/base.css vendored

@ -866,6 +866,13 @@ li.CodeMirror-hint-active {
border: none;
color: #e85050 !important;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;
overflow-y: hidden;
white-space: nowrap;
word-break: break-all;
}
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-text {
@ -881,6 +888,7 @@ li.CodeMirror-hint-active {
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble {

8
dist/bundle.css vendored

@ -2387,6 +2387,13 @@ li.CodeMirror-hint-active {
border: none;
color: #e85050 !important;
}
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;
overflow-y: hidden;
white-space: nowrap;
word-break: break-all;
}
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-text {
@ -2402,6 +2409,7 @@ li.CodeMirror-hint-active {
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble {

7
src/css/base/single/label.css

@ -0,0 +1,7 @@
.bi-label {
text-overflow: ellipsis;
overflow-x: hidden;
overflow-y: hidden;
white-space: nowrap;
word-break: break-all;
}

1
src/css/base/single/text.css

@ -11,5 +11,6 @@
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}

6
src/less/base/single/label.less

@ -0,0 +1,6 @@
@import "../../bibase";
.bi-label {
.overflow-dot();
word-break: break-all;
}

1
src/less/base/single/text.less

@ -3,5 +3,6 @@
.bi-text {
.overflow-dot();
.box-sizing(border-box);
word-wrap: break-word;
word-break: break-word;
}
Loading…
Cancel
Save