Skip to content

Commit

Permalink
fix: use consistent border width for select button in inputs and pickers
Browse files Browse the repository at this point in the history
  • Loading branch information
@joneff
joneff committed Nov 23, 2021
1 parent 9a0b3cb commit d517f2a
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 47 deletions.
2 changes: 0 additions & 2 deletions packages/bootstrap/scss/colorpicker/_variables.scss
View file
Expand Up @@ -3,8 +3,6 @@ $colorpicker-font-family: $font-family !default;
$colorpicker-font-size: $font-size !default;
$colorpicker-line-height: $line-height !default;

$colorpicker-select-border-width: 1px !default;

$colorpicker-bg: $button-bg !default;
$colorpicker-text: $button-text !default;
$colorpicker-border: $button-border !default;
Expand Down
1 change: 0 additions & 1 deletion packages/bootstrap/scss/combobox/_variables.scss
View file
Expand Up @@ -2,7 +2,6 @@
$combobox-select-padding-x: $button-padding-y !default;
$combobox-select-padding-y: $button-padding-y !default;
$combobox-select-width: null !default;
$combobox-select-border-width: 1px !default;

$combobox-bg: $input-bg !default;
$combobox-text: $input-text !default;
Expand Down
2 changes: 0 additions & 2 deletions packages/classic/scss/colorpicker/_variables.scss
View file
Expand Up @@ -3,8 +3,6 @@ $colorpicker-font-family: $font-family !default;
$colorpicker-font-size: $font-size !default;
$colorpicker-line-height: $line-height !default;

$colorpicker-select-border-width: 1px !default;

$colorpicker-bg: $button-bg !default;
$colorpicker-text: $button-text !default;
$colorpicker-border: $button-border !default;
Expand Down
1 change: 0 additions & 1 deletion packages/classic/scss/combobox/_variables.scss
View file
Expand Up @@ -2,7 +2,6 @@
$combobox-select-padding-x: $button-padding-y !default;
$combobox-select-padding-y: $button-padding-y !default;
$combobox-select-width: $button-inner-calc-size !default;
$combobox-select-border-width: 1px !default;

$combobox-bg: $input-bg !default;
$combobox-text: $input-text !default;
Expand Down
12 changes: 2 additions & 10 deletions packages/default/scss/colorpicker/_layout.scss
View file
Expand Up @@ -99,7 +99,8 @@
.k-select {
padding: $picker-select-padding-y $picker-select-padding-x;
width: if( $use-picker-select-width, $button-inner-calc-size, null );
border-width: 0 0 0 $colorpicker-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
border-style: solid;
border-color: inherit;
box-sizing: border-box;
Expand All @@ -113,15 +114,6 @@
.k-icon {}
}

.k-rtl &,
&[dir="rtl"] {
.k-picker-wrap {
.k-select {
border-width: 0 $colorpicker-select-border-width 0 0;
}
}
}

}

.k-colorpicker-popup .k-coloreditor {
Expand Down
2 changes: 0 additions & 2 deletions packages/default/scss/colorpicker/_variables.scss
View file
Expand Up @@ -3,8 +3,6 @@ $colorpicker-font-family: $font-family !default;
$colorpicker-font-size: $font-size !default;
$colorpicker-line-height: $line-height !default;

$colorpicker-select-border-width: 1px !default;

$colorpicker-bg: $button-bg !default;
$colorpicker-text: $button-text !default;
$colorpicker-border: $button-border !default;
Expand Down
7 changes: 2 additions & 5 deletions packages/default/scss/combobox/_layout.scss
View file
Expand Up @@ -42,7 +42,8 @@
.k-select {
padding: $combobox-select-padding-y $combobox-select-padding-x;
width: if( $use-picker-select-width, $combobox-select-width, null );
border-width: 0 0 0 $combobox-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
box-sizing: border-box;
border-style: solid;
display: flex;
Expand All @@ -56,10 +57,6 @@
&[dir="rtl"],
.k-rtl & {
text-align: right;

.k-select {
border-width: 0 $combobox-select-border-width 0 0;
}
}
}
}
1 change: 0 additions & 1 deletion packages/default/scss/combobox/_variables.scss
View file
Expand Up @@ -2,7 +2,6 @@
$combobox-select-padding-x: 0px !default;
$combobox-select-padding-y: 0px !default;
$combobox-select-width: $button-inner-calc-size !default;
$combobox-select-border-width: 0px !default;

$combobox-bg: $input-bg !default;
$combobox-text: $input-text !default;
Expand Down
21 changes: 6 additions & 15 deletions packages/default/scss/datetime/_layout.scss
View file
Expand Up @@ -43,7 +43,8 @@
.k-select {
padding: 0;
width: if( $use-picker-select-width, $spinner-width, null );
border-width: 0 0 0 $picker-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
border-style: solid;
box-sizing: border-box;
outline: 0;
Expand Down Expand Up @@ -81,10 +82,6 @@
.k-rtl &,
&[dir="rtl"] {
text-align: right;

.k-select {
border-width: 0 $picker-select-border-width 0 0;
}
}


Expand Down Expand Up @@ -147,7 +144,8 @@
.k-select {
padding: $picker-select-padding-y $picker-select-padding-x;
width: if( $use-picker-select-width, $picker-select-calc-size, null );
border-width: 0 0 0 $picker-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
border-style: solid;
box-sizing: border-box;
outline: 0;
Expand All @@ -164,10 +162,6 @@
.k-rtl &,
&[dir="rtl"] {
text-align: right;

.k-select {
border-width: 0 $picker-select-border-width 0 0;
}
}
}

Expand Down Expand Up @@ -214,7 +208,8 @@

// Select
.k-select {
border-width: 0 0 0 $picker-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
border-style: solid;
box-sizing: border-box;
outline: 0;
Expand Down Expand Up @@ -243,10 +238,6 @@
.k-rtl &,
&[dir="rtl"] {
text-align: right;

.k-select {
border-width: 0 $picker-select-border-width 0 0;
}
}
}

Expand Down
7 changes: 2 additions & 5 deletions packages/default/scss/numerictextbox/_layout.scss
View file
Expand Up @@ -45,7 +45,8 @@
.k-select {
padding: 0;
width: if( $use-picker-select-width, $spinner-width, null );
border-width: 0 0 0 $picker-select-border-width;
border-width: 0;
border-inline-start-width: $picker-select-border-width;
border-style: solid;
box-sizing: border-box;
display: flex;
Expand Down Expand Up @@ -86,10 +87,6 @@
.k-rtl &,
&[dir="rtl"] {
text-align: right;

.k-select {
border-width: 0 $picker-select-border-width 0 0;
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions packages/material/scss/colorpicker/_variables.scss
View file
Expand Up @@ -3,8 +3,6 @@ $colorpicker-font-family: $font-family !default;
$colorpicker-font-size: $font-size !default;
$colorpicker-line-height: $line-height !default;

$colorpicker-select-border-width: 0px !default;

$colorpicker-bg: null !default;
$colorpicker-text: $input-text !default;
$colorpicker-border: $input-border !default;
Expand Down
1 change: 0 additions & 1 deletion packages/material/scss/combobox/_variables.scss
View file
Expand Up @@ -2,7 +2,6 @@
$combobox-select-padding-x: ($button-padding-y / 2) !default;
$combobox-select-padding-y: $button-padding-y !default;
$combobox-select-width: null !default;
$combobox-select-border-width: 0px !default;

$combobox-bg: $input-bg !default;
$combobox-text: $input-text !default;
Expand Down

0 comments on commit d517f2a

Please sign in to comment.