diff --git a/examples/dev.html b/examples/dev.html
index bf845c987..74f0eccdb 100644
--- a/examples/dev.html
+++ b/examples/dev.html
@@ -19,7 +19,8 @@
return {
type: "bi.vertical",
items: [{
- type: "bi.horizontal",
+ type: "bi.center_adapt",
+ verticalAlign: "top",
height: 300,
columnSize: [300, "fill"],
items: [{
diff --git a/src/case/calendar/calendar.year.js b/src/case/calendar/calendar.year.js
index 7de781159..a692d19b8 100644
--- a/src/case/calendar/calendar.year.js
+++ b/src/case/calendar/calendar.year.js
@@ -62,8 +62,9 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
});
BI.createWidget(BI.extend({
element: this
-
}, BI.LogicFactory.createLogic("vertical", BI.extend({}, o.logic, {
+ scrolly: true,
+ vgap: 5,
items: BI.LogicFactory.createLogicItemsByDirection("top", this.years)
}))));
},
@@ -168,4 +169,4 @@ BI.extend(BI.YearCalendar, {
}
});
-BI.shortcut("bi.year_calendar", BI.YearCalendar);
\ No newline at end of file
+BI.shortcut("bi.year_calendar", BI.YearCalendar);
diff --git a/src/less/base/calendar/calendar.year.less b/src/less/base/calendar/calendar.year.less
deleted file mode 100644
index 47650c671..000000000
--- a/src/less/base/calendar/calendar.year.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-year-calendar {
- padding-top: 5px;
- padding-bottom: 5px;
-}
\ No newline at end of file
diff --git a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less
index 1aded34ca..12239c7de 100644
--- a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less
+++ b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less
@@ -1,8 +1,7 @@
@import "../../../index";
-@import "../../../resource/background";
.bi-color-picker-editor {
& .color-picker-editor-display {
.border-radius(2px);
}
-}
\ No newline at end of file
+}
diff --git a/src/less/base/editor/editor.search.small.less b/src/less/base/editor/editor.search.small.less
index d25b4546a..234609f99 100644
--- a/src/less/base/editor/editor.search.small.less
+++ b/src/less/base/editor/editor.search.small.less
@@ -1,19 +1,23 @@
@import "../../index";
-/*************BI.SearchEditor******************/
+
.bi-small-search-editor {
& .bi-editor {
font-size: @font-size-12;
- & .bi-input{
+
+ & .bi-input {
font-size: @font-size-12;
}
- & .bi-label{
+
+ & .bi-label {
font-size: @font-size-12;
}
}
-& .close-font{
- font-size: @font-size-16;
-}
- & .search-font{
+
+ & .close-font {
+ font-size: @font-size-16;
+ }
+
+ & .search-font {
font-size: @font-size-16;
}
-}
\ No newline at end of file
+}
diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less
index 4a5597ce6..46757b435 100644
--- a/src/less/base/segment/button.segment.less
+++ b/src/less/base/segment/button.segment.less
@@ -2,14 +2,4 @@
.bi-segment-button {
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%);
- //}
}
diff --git a/src/less/base/single/icon.less b/src/less/base/single/icon.less
deleted file mode 100644
index a885cefdf..000000000
--- a/src/less/base/single/icon.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.x-icon.b-font {
- // todo 删掉文件
- //margin: auto;
- //width: 100%;
-}
diff --git a/src/less/base/single/tip/tip.less b/src/less/base/single/tip/tip.less
index 99a050472..087f342a6 100644
--- a/src/less/base/single/tip/tip.less
+++ b/src/less/base/single/tip/tip.less
@@ -1,6 +1,5 @@
@import "../../../index";
-
.bi-tip{
position: fixed !important;
}
diff --git a/src/less/widget/multiselect/multiselect.combo.less b/src/less/widget/multiselect/multiselect.combo.less
index 4db735bcb..643062ec9 100644
--- a/src/less/widget/multiselect/multiselect.combo.less
+++ b/src/less/widget/multiselect/multiselect.combo.less
@@ -2,7 +2,7 @@
@val: transform .3s ease;
.bi-multi-select-combo{
& .multi-select-trigger-icon-button{
- font-size: 16px;
+ font-size: @font-size-16;
}
// 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下
& .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
@@ -17,4 +17,4 @@
.transition(@val);
}
}
-}
\ No newline at end of file
+}