Browse Source

Pull request #2306: 无JIAR任务 整理一下样式

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'eb947ff5450f4f30ccec0771d4ea8ff6a96e1ab7':
  优化代码
  整理一下样式
es6
guy 3 years ago
parent
commit
8b52945ad9
  1. 3
      examples/dev.html
  2. 5
      src/case/calendar/calendar.year.js
  3. 6
      src/less/base/calendar/calendar.year.less
  4. 3
      src/less/base/colorchooser/colorpicker/editor.colorpicker.less
  5. 20
      src/less/base/editor/editor.search.small.less
  6. 10
      src/less/base/segment/button.segment.less
  7. 5
      src/less/base/single/icon.less
  8. 1
      src/less/base/single/tip/tip.less
  9. 4
      src/less/widget/multiselect/multiselect.combo.less

3
examples/dev.html

@ -19,7 +19,8 @@
return { return {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.horizontal", type: "bi.center_adapt",
verticalAlign: "top",
height: 300, height: 300,
columnSize: [300, "fill"], columnSize: [300, "fill"],
items: [{ items: [{

5
src/case/calendar/calendar.year.js

@ -62,8 +62,9 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this element: this
}, BI.LogicFactory.createLogic("vertical", BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic("vertical", BI.extend({}, o.logic, {
scrolly: true,
vgap: 5,
items: BI.LogicFactory.createLogicItemsByDirection("top", this.years) items: BI.LogicFactory.createLogicItemsByDirection("top", this.years)
})))); }))));
}, },
@ -168,4 +169,4 @@ BI.extend(BI.YearCalendar, {
} }
}); });
BI.shortcut("bi.year_calendar", BI.YearCalendar); BI.shortcut("bi.year_calendar", BI.YearCalendar);

6
src/less/base/calendar/calendar.year.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}

3
src/less/base/colorchooser/colorpicker/editor.colorpicker.less

@ -1,8 +1,7 @@
@import "../../../index"; @import "../../../index";
@import "../../../resource/background";
.bi-color-picker-editor { .bi-color-picker-editor {
& .color-picker-editor-display { & .color-picker-editor-display {
.border-radius(2px); .border-radius(2px);
} }
} }

20
src/less/base/editor/editor.search.small.less

@ -1,19 +1,23 @@
@import "../../index"; @import "../../index";
/*************BI.SearchEditor******************/
.bi-small-search-editor { .bi-small-search-editor {
& .bi-editor { & .bi-editor {
font-size: @font-size-12; font-size: @font-size-12;
& .bi-input{
& .bi-input {
font-size: @font-size-12; font-size: @font-size-12;
} }
& .bi-label{
& .bi-label {
font-size: @font-size-12; font-size: @font-size-12;
} }
} }
& .close-font{
font-size: @font-size-16; & .close-font {
} font-size: @font-size-16;
& .search-font{ }
& .search-font {
font-size: @font-size-16; font-size: @font-size-16;
} }
} }

10
src/less/base/segment/button.segment.less

@ -2,14 +2,4 @@
.bi-segment-button { .bi-segment-button {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
//&.active {
// &:active {
// color: @color-bi-text;
// background-color: @color-bi-background-highlight;
// }
//}
//&:active {
// color: @color-bi-text-highlight;
// .background-color(@color-bi-background-highlight, 10%);
//}
} }

5
src/less/base/single/icon.less

@ -1,5 +0,0 @@
.x-icon.b-font {
// todo 删掉文件
//margin: auto;
//width: 100%;
}

1
src/less/base/single/tip/tip.less

@ -1,6 +1,5 @@
@import "../../../index"; @import "../../../index";
.bi-tip{ .bi-tip{
position: fixed !important; position: fixed !important;
} }

4
src/less/widget/multiselect/multiselect.combo.less

@ -2,7 +2,7 @@
@val: transform .3s ease; @val: transform .3s ease;
.bi-multi-select-combo{ .bi-multi-select-combo{
& .multi-select-trigger-icon-button{ & .multi-select-trigger-icon-button{
font-size: 16px; font-size: @font-size-16;
} }
// 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下 // 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下
& .bi-combo.bi-combo-popup + .bi-trigger-icon-button { & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@ -17,4 +17,4 @@
.transition(@val); .transition(@val);
} }
} }
} }

Loading…
Cancel
Save