Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2044: Use selectize-border-radius for remove_button radius #1980

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #2044: Use selectize-border-radius for remove_button radius #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/less/selectize.bootstrap2.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
@selectize-shadow-input: none;
@selectize-shadow-input-focus: inset 0 1px 2px rgba(0,0,0,0.15);
@selectize-border-radius: @inputBorderRadius;
@selectize-border-radius-item: @selectize-border-radius - 1px;

@selectize-padding-x: 10px;
@selectize-padding-y: 7px;
Expand Down Expand Up @@ -134,7 +135,7 @@
.gradientBar(@btnBackground, @btnBackgroundHighlight, @selectize-color-item-text, none);
*background-color: @selectize-color-item;
border: @selectize-width-item-border solid @selectize-color-item-border;
.border-radius(@baseBorderRadius);
.border-radius(@selectize-border-radius-item);
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
&.active {
.box-shadow(~"0 1px 2px rgba(0,0,0,.05)");
Expand Down
3 changes: 2 additions & 1 deletion src/less/selectize.bootstrap3.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@selectize-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten(@selectize-color-input-error, 20%);
@selectize-border: 1px solid @input-border;
@selectize-border-radius: @input-border-radius;
@selectize-border-radius-item: @selectize-border-radius - 1px;

@selectize-width-item-border: 0;
@selectize-padding-x: @padding-base-horizontal;
Expand Down Expand Up @@ -119,7 +120,7 @@
padding-right: @selectize-padding-x - @selectize-padding-item-x;
}
.selectize-input > div {
.selectize-border-radius(@selectize-border-radius - 1px);
.selectize-border-radius(@selectize-border-radius-item);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/less/selectize.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
@selectize-border: 1px solid @selectize-color-border;
@selectize-dropdown-border: 1px solid @selectize-color-dropdown-border;
@selectize-border-radius: 3px;
@selectize-border-radius-item: @selectize-border-radius - 1px;

@selectize-width-item-border: 0;
@selectize-max-height-dropdown: 200px;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/remove_button/plugin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
display: inline-block;
padding: @selectize-padding-item-y 0 0 0;
border-left: 1px solid @selectize-color-item-border;
.selectize-border-radius(0 2px 2px 0);
.selectize-border-radius(0 @selectize-border-radius-item @selectize-border-radius-item 0);
.selectize-box-sizing(border-box);
}
[data-value] .remove:hover {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/remove_button/plugin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
display: inline-block;
padding: $select-padding-item-y $select-padding-item-x;
border-left: 1px solid $select-color-item-border;
border-radius: 0 2px 2px 0;
border-radius: 0 $select-border-radius-item $select-border-radius-item 0;
box-sizing: border-box;
margin-left: $select-padding-item-x;
}
Expand Down
3 changes: 2 additions & 1 deletion src/scss/selectize.bootstrap3.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ $select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 6px lighten($select-color-input-error, 20%);
$select-border: 1px solid $input-border;
$select-border-radius: $input-border-radius;
$select-border-radius-item: $select-border-radius - 1px;

$select-width-item-border: 0px;
$select-padding-x: $padding-base-horizontal;
Expand Down Expand Up @@ -123,7 +124,7 @@ $select-arrow-offset: $select-padding-x + 5px;
padding-right: $select-padding-x - $select-padding-item-x;
}
.#{$selectize}-input > div {
border-radius: $select-border-radius - 1px;
border-radius: $select-border-radius-item;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/scss/selectize.bootstrap4.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 6px lighten($select-color-input-error, 20%) !default;
$select-border: 1px solid $input-border-color !default;
$select-border-radius: $input-border-radius !default;
$select-border-radius-item: calc(#{$select-border-radius} - 1px);

$select-width-item-border: 0px !default;
$select-padding-x: $input-btn-padding-x !default;
Expand Down Expand Up @@ -153,7 +154,7 @@ $select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
padding-right: calc(#{$select-padding-x} - #{$select-padding-item-x});
}
.#{$selectize}-input > div {
border-radius: calc(#{$select-border-radius} - 1px);
border-radius: $select-border-radius-item;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/scss/selectize.bootstrap5.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 6px lighten($select-color-input-error, 20%) !default;
$select-border: 1px solid $input-border-color !default;
$select-border-radius: $input-border-radius !default;
$select-border-radius-item: calc(#{$select-border-radius} - 1px);

$select-width-item-border: 0px !default;
$select-padding-x: $input-btn-padding-x !default;
Expand Down Expand Up @@ -153,7 +154,7 @@ $select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
padding-right: calc(#{$select-padding-x} - #{$select-padding-item-x});
}
.#{$selectize}-input > div {
border-radius: calc(#{$select-border-radius} - 1px);
border-radius: $select-border-radius-item;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/scss/selectize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ $select-shadow-input-focus: inset 0 1px 2px rgba(0, 0, 0, 0.15) !default;
$select-border: 1px solid $select-color-border !default;
$select-dropdown-border: 1px solid $select-color-dropdown-border !default;
$select-border-radius: 3px !default;
$select-border-radius-item: calc(#{$select-border-radius} - 1px);

$select-width-item-border: 0px !default;
$select-max-height-dropdown: 200px !default;
Expand Down