Skip to content

Commit 1ef63fb

Browse files
committed
perbaikn
1 parent 58bed74 commit 1ef63fb

File tree

8 files changed

+19
-25
lines changed

8 files changed

+19
-25
lines changed

dist/it-framework.all.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ var IT = (function () {
468468

469469
if (!el.noRow) {
470470
div = $("<div/>", {
471-
class: 'row form-row'
471+
class: 'row form-row align-items-center'
472472
});
473473
el.renderTo(div);
474474
wrapper.append(div);
@@ -753,7 +753,7 @@ var IT = (function () {
753753
items: []
754754
}, settings);
755755
me.id = me.settings.id || Utils.id();
756-
me.content = $("\n\t\t\t<div id=\"".concat(me.id, "\" class=\"it-toolbar toolbar-").concat(me.settings.position, " clearfix\">\n\t\t\t\t<ul class=\"it-toolbar-left\"></ul>\n\t\t\t\t<ul class=\"it-toolbar-right\"></ul>\n\t\t\t</div>\n\t\t"));
756+
me.content = $("\n\t\t\t<div id=\"".concat(me.id, "\" class=\"it-toolbar toolbar-").concat(me.settings.position, "\">\n\t\t\t\t<ul class=\"it-toolbar-left\"></ul>\n\t\t\t\t<ul class=\"it-toolbar-right\"></ul>\n\t\t\t</div>\n\t\t"));
757757
me.ids = [];
758758
me.items = {};
759759
$.each(me.settings.items, function (k, el) {

dist/it-framework.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/lib/Form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default class Form extends Component {
4040
if (!el.isClass)
4141
el = Utils.createObject(el);
4242
if (!el.noRow) {
43-
div = $("<div/>", { class: 'row form-row' });
43+
div = $("<div/>", { class: 'row form-row align-items-center' });
4444
el.renderTo(div);
4545
wrapper.append(div);
4646
} else {

src/js/lib/ToolBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default class Toolbar extends Component{
1212
},settings);
1313
me.id = me.settings.id||Utils.id();
1414
me.content = $(`
15-
<div id="${me.id}" class="it-toolbar toolbar-${me.settings.position} clearfix">
15+
<div id="${me.id}" class="it-toolbar toolbar-${me.settings.position}">
1616
<ul class="it-toolbar-left"></ul>
1717
<ul class="it-toolbar-right"></ul>
1818
</div>

src/sass/_variable.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ $label_width_default: 100px;
2323
$input_border_invalid_color: red;
2424
$input_info_bg_color: #eee;
2525
$input_info_text_color: #666666;
26-
$input_readonly_bg_color: #FFFADB;
27-
$input_readonly_border_color: #F7FC71;
26+
$input_readonly_bg_color: #F7FC71;
27+
$input_readonly_border_color: darken($input_readonly_bg_color, 20);
2828
$input_width_default: 200px;
2929
$input_height_default: 30px;
3030
$input_padding: 0 10px;
31+
$input_font_size: 12px;
3132

3233
// Select
3334
$select_height_default: 30px;

src/sass/components/_dialog.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
visibility: visible;
3333
@include prefix(transform, scale(1));
3434
}
35-
36-
>.it-title {
37-
@include prefix(border-radius, 0 0 0 0);
38-
}
3935
}
4036

4137
&-header {
@@ -44,8 +40,8 @@
4440
background: #f4f4f4;
4541

4642
.it-title {
47-
background: transparent;
48-
border-top: 1px solid #eee;
43+
background: #fff;
44+
border-bottom: 1px solid #eee;
4945
}
5046
}
5147

@@ -58,7 +54,7 @@
5854
}
5955

6056
&-footer {
61-
background: #f4f4f4;
57+
border-top: 1px solid #eee;
6258
@include size(100%, '');
6359
@include align-self(flex-end);
6460
padding: 0 6px;

src/sass/components/_edit.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.it {
22
&-edit {
3-
width: 100%;
4-
@include flexbox();
3+
//@include flexbox();
54

65
&.for-option {
76
.it-input-label {
@@ -49,9 +48,13 @@
4948
&-input {
5049
box-shadow: inset 0 2px 3px rgba($color: #ccc, $alpha: .2);
5150
font-family: Roboto;
51+
font-size: $input_font_size;
5252
line-height: $input_height_default;
5353
height: $input_height_default;
5454
@include flex(1);
55+
width: 100%;
56+
box-sizing: border-box;
57+
border-radius: 2px;
5558

5659
&.noflex {
5760
@include flex(0);
@@ -61,7 +64,7 @@
6164
&:focus {
6265
border-color: $input_border_focus_color;
6366
}
64-
67+
6568
// Invalid
6669
&.invalid {
6770
border-color: $input_border_invalid_color;

src/sass/components/_toolbar.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
&-toolbar {
33
position: relative;
44
background: #fff;
5-
@include flexbox();
6-
@include align-items(center);
5+
align-items: center;
6+
display: flex;
77
padding: $toolbar_padding;
88

99
&-left,
@@ -41,18 +41,12 @@
4141
height: $toolbar_input_height;
4242
line-height: $toolbar_input_height;
4343
}
44-
.selectize-input {
45-
line-height: $toolbar_select_height;
46-
@include size(100%, $toolbar_select_height);
47-
}
4844
}
4945

5046
// Button Component
5147
.it-btn {
5248
height: $toolbar_button_height;
5349
line-height: $toolbar_button_height;
54-
55-
5650
}
5751
}
5852
}

0 commit comments

Comments
 (0)