Skip to content

Commit

Permalink
Merge pull request #96 from DevChu/revert-4227
Browse files Browse the repository at this point in the history 
Revert "ZK-4227: Combobox is flickering when resizing"
  • Loading branch information
@plijyfes
plijyfes authored Jun 3, 2019
2 parents 50ddc1b + 482a1c1 commit 480508b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 60 deletions.
12 changes: 2 additions & 10 deletions breeze/src/archive/web/js/zkmax/inp/less/timepicker.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -29,16 +28,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down
18 changes: 8 additions & 10 deletions breeze/src/archive/web/js/zul/inp/less/combo.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5px;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -34,16 +33,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down Expand Up @@ -90,6 +82,11 @@
cursor: default;
.boxShadow(none);
}

&-rightedge {
border-right: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
}
}

.z-combobox-disabled>.z-combobox-button:hover,
Expand Down Expand Up @@ -142,6 +139,7 @@
.z-spinner-button,
.z-doublespinner-button {
padding: 0;
position: relative;

&:hover,
&:active {
Expand Down
12 changes: 2 additions & 10 deletions sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -29,16 +28,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down
18 changes: 8 additions & 10 deletions sapphire/src/archive/web/js/zul/inp/less/combo.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5px;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -34,16 +33,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down Expand Up @@ -90,6 +82,11 @@
cursor: default;
.boxShadow(none);
}

&-rightedge {
border-right: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
}
}

.z-combobox-disabled>.z-combobox-button:hover,
Expand Down Expand Up @@ -142,6 +139,7 @@
.z-spinner-button,
.z-doublespinner-button {
padding: 0;
position: relative;

&:hover,
&:active {
Expand Down
12 changes: 2 additions & 10 deletions silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -29,16 +28,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down
18 changes: 8 additions & 10 deletions silvertail/src/archive/web/js/zul/inp/less/combo.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@

&-input {
.fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @baseTextColor);
width: 100%;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
border-right: 0;
.leftBorderRadius(@borderRadiusSmall);
margin: 0;
padding: 4px 5px;
padding-right: @baseButtonWidth + 5px;
line-height: @baseLineHeight;
background: @inputBackgroundColor;

Expand All @@ -34,16 +33,9 @@
}
}

&-input-full {
padding-right: 5px;
}

&-button {
.iconFontStyle(@baseFontSize, @iconColor);
display: inline-block;
position: relative;
top: 0;
right: @baseButtonWidth;
min-width: @baseButtonWidth;
height: @baseButtonHeight;
border: 1px solid @inputBorderColor;
Expand Down Expand Up @@ -90,6 +82,11 @@
cursor: default;
.boxShadow(none);
}

&-rightedge {
border-right: 1px solid @inputBorderColor;
.borderRadius(@borderRadiusSmall);
}
}

.z-combobox-disabled>.z-combobox-button:hover,
Expand Down Expand Up @@ -142,6 +139,7 @@
.z-spinner-button,
.z-doublespinner-button {
padding: 0;
position: relative;

&:hover,
&:active {
Expand Down

0 comments on commit 480508b

Please sign in to comment.