Skip to content

Commit 84767de

Browse files
committed
Perbaikan Sementara
1 parent 7f15721 commit 84767de

File tree

9 files changed

+57
-40
lines changed

9 files changed

+57
-40
lines changed

dist/it-framework-all.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2591,7 +2591,7 @@ IT.Toolbar = class extends IT.Component {
25912591
},settings);
25922592
me.id = me.settings.id||IT.Utils.id();
25932593
me.content = $(`
2594-
<div id="${me.id}" class="it-toolbar toolbar-${me.settings.position} clearfix">
2594+
<div id="${me.id}" class="it-toolbar toolbar-${me.settings.position}">
25952595
<ul class="it-toolbar-left"></ul>
25962596
<ul class="it-toolbar-right"></ul>
25972597
</div>

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.

dist/it-framework.min.js

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/sass/_variable.scss

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ $view_sm: 768px;
99
$view_md: 992px;
1010
$view_lg: 1200px;
1111

12+
$title_height: 32px;
13+
$title_padding: 0 10px;
14+
1215
// Form
1316
$form_space_padding: 15px 15px 0px;
1417
$form_space_items: 15px;
1518
$label_width_default: 100px;
19+
1620
// Input
17-
$input_height_default: 25px;
1821
$input_border_color: #ccc;
1922
$input_border_focus_color: #66AFE9;
2023
$input_border_invalid_color: red;
@@ -23,19 +26,22 @@ $label_width_default: 100px;
2326
$input_readonly_bg_color: #FFFADB;
2427
$input_readonly_border_color: #F7FC71;
2528
$input_width_default: 200px;
26-
$input_height_default: 25px;
29+
$input_height_default: 30px;
30+
$input_padding: 0 10px;
31+
2732
// Select
28-
$select_height_default: 25px;
33+
$select_height_default: 30px;
34+
2935
// CheckBox
3036
$checkbox_width_default: 21px;
3137
$checkbox_height_default: 21px;
3238
$checkbox_label_fontsize: 15px;
3339

3440
// Toolbar
35-
$toolbar_height_default : 35px;
36-
$toolbar_input_height: 25px;
37-
$toolbar_select_height: 25px;
38-
$toolbar_button_height: 25px;
41+
$toolbar_input_height: 30px;
42+
$toolbar_select_height: 30px;
43+
$toolbar_button_height: 30px;
44+
$toolbar_padding: 6px 0;
3945

4046
// MessageBox
4147
$state_primary_color: #4BC0F9;
@@ -50,7 +56,7 @@ $state_warning_dark_color: #C99F01;
5056
// Button
5157
$button_height_default: 30px;
5258
$button_text_color: #000;
53-
$button_text_size: 11px;
59+
$button_text_size: 13px;
5460
$button_border_color: #999;
5561
$button_border: 1px solid $button_border_color;
5662
$button_background_color: #fff;

src/sass/components/_button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
border-radius: $button_rounded_size;
66
color: $button_text_color;
77
cursor: pointer;
8-
font-family: Aller;
8+
font-family: Roboto;
99
font-size: $button_text_size;
1010
display: inline-block;
1111
padding: $button_padding;

src/sass/components/_dialog.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@include justify-content(center);
88
@include align-items(center);
99
@include prefix(backface-visibility, hidden);
10-
@include transition(all .3s);
10+
@include transition(all 250ms);
1111

1212
&.dialog-show {
1313
visibility: visible;
@@ -24,7 +24,7 @@
2424
@include prefix(border-radius, 3px);
2525
@include prefix(box-shadow, 0 0 5px rgba(0, 0, 0, .3));
2626
@include prefix(transform, scale(.7));
27-
@include transition(all .3s);
27+
@include transition(all 250ms);
2828
@include flexbox();
2929
@include flex-direction(column);
3030

@@ -34,12 +34,7 @@
3434
}
3535

3636
>.it-title {
37-
background: #eee;
38-
padding: 13px;
39-
font-family: Roboto;
40-
font-weight: bold;
4137
@include prefix(border-radius, 0 0 0 0);
42-
@include prefix(box-shadow, none);
4338
}
4439
}
4540

src/sass/components/_edit.scss

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848

4949
&-input {
50-
box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.1);
50+
box-shadow: inset 0 2px 3px rgba($color: #ccc, $alpha: .2);
5151
font-family: Roboto;
5252
line-height: $input_height_default;
5353
height: $input_height_default;
@@ -107,7 +107,7 @@
107107
&-input,
108108
&-item {
109109
border: 1px solid $input_border_color;
110-
padding: 0 5px;
110+
padding: $input_padding;
111111
}
112112

113113
&-item {
@@ -121,7 +121,7 @@
121121
&-input,
122122
&-item {
123123
border: 1px solid $input_border_color;
124-
padding: 0 5px;
124+
padding: $input_padding;
125125
height: $input_height_default;
126126
line-height: $input_height_default;
127127
}
@@ -134,4 +134,11 @@
134134
border-left: none;
135135
}
136136
}
137+
138+
&-input {
139+
&-label {
140+
margin: 0;
141+
line-height: 1.6em;
142+
}
143+
}
137144
}

src/sass/components/_title.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
.it {
22
&-title {
3-
@include gradient($base_color, $base_color_dark);
4-
padding: 7px;
5-
color: #333;
6-
font-family: Aller;
3+
padding: $title_padding;
4+
height: $title_height;
5+
line-height: $title_height;
6+
font-weight: 500;
7+
font-size: 14px;
8+
background: #eee;
9+
text-transform: uppercase;
10+
border-radius: 3px;
711

812
.fa {
913
margin-right: 8px;
14+
width: 16px;
1015
}
1116
}
1217
}

src/sass/components/_toolbar.scss

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
.it {
22
&-toolbar {
3-
white-space: nowrap;
43
position: relative;
5-
padding: 3px;
6-
@include gradient($base_color, $base_color_dark);
4+
background: #fff;
75
@include flexbox();
86
@include align-items(center);
9-
border-bottom: 1px solid #eee;
7+
padding: $toolbar_padding;
108

119
&-left,
1210
&-right {
1311
list-style: none;
14-
@include resetMP();
15-
@include flexbox();
16-
@include align-items(center);
12+
margin: 0;
13+
padding-left: 0;
14+
display: flex;
15+
align-items: center;
16+
}
1717

18+
&-left {
19+
margin-right: auto;
20+
1821
> li {
19-
display: inline;
2022
margin-right: 4px;
2123
}
2224
}
2325

24-
&-left {
25-
@include flex(1);
26-
}
26+
&-right {
27+
margin-left: auto;
2728

28-
&-right {}
29+
> li {
30+
margin-left: 4px;
31+
}
32+
}
2933

3034
// Textbox, Select Component
3135
.it-edit {
@@ -50,12 +54,12 @@
5054

5155
&:not([class*="btn-"]) {
5256
border-color: transparent;
53-
background: transparent;
57+
background: #f8f8f8;
5458
@include transition(transform .2s);
5559

5660
&:hover {
5761
@include gradient($base_color, $base_color_dark);
58-
border-color: #ddd;
62+
border-color: #e4e4e4;
5963
}
6064
}
6165
}

0 commit comments

Comments
 (0)