Skip to content

Commit 2c36e3f

Browse files
committed
refactor(CMultiSelect): improve border radius in small and large variant
1 parent 7cd37ea commit 2c36e3f

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

scss/_variables.scss

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,8 @@ $form-multi-select-indicator: url("data:image/svg+xml,<svg xmlns='
11981198
$form-multi-select-border-width: $input-border-width !default;
11991199
$form-multi-select-border-color: $input-border-color !default;
12001200
$form-multi-select-border-radius: $border-radius !default;
1201+
$form-multi-select-border-radius-sm: $border-radius-sm !default;
1202+
$form-multi-select-border-radius-lg: $border-radius-lg !default;
12011203
$form-multi-select-box-shadow: inset 0 1px 2px rgba($black, .075) !default;
12021204

12031205
$form-multi-select-focus-width: $input-focus-width !default;
@@ -1209,14 +1211,16 @@ $form-multi-select-focus-box-shadow: 0 0 0 $form-multi-select-focus-width
12091211
$form-multi-select-selection-tags-padding-y: .125rem !default;
12101212
$form-multi-select-selection-tags-padding-x: .125rem !default;
12111213

1212-
$form-multi-select-tag-bg: $light !default;
1213-
$form-multi-select-tag-border-width: $border-width !default;
1214-
$form-multi-select-tag-border-color: $border-color !default;
1215-
$form-multi-select-tag-border-radius: $border-radius !default;
1216-
$form-multi-select-tag-margin-y: .125rem !default;
1217-
$form-multi-select-tag-margin-x: .125rem !default;
1218-
$form-multi-select-tag-padding-y: subtract(($form-multi-select-padding-y - $form-multi-select-selection-tags-padding-y - $form-multi-select-tag-margin-y), $form-multi-select-tag-border-width) !default;
1219-
$form-multi-select-tag-padding-x: .5rem !default;
1214+
$form-multi-select-tag-bg: $light !default;
1215+
$form-multi-select-tag-border-width: $border-width !default;
1216+
$form-multi-select-tag-border-color: $border-color !default;
1217+
$form-multi-select-tag-border-radius: .25rem !default;
1218+
$form-multi-select-tag-border-radius-sm: .125rem !default;
1219+
$form-multi-select-tag-border-radius-lg: .375rem !default;
1220+
$form-multi-select-tag-margin-y: .125rem !default;
1221+
$form-multi-select-tag-margin-x: .125rem !default;
1222+
$form-multi-select-tag-padding-y: subtract(($form-multi-select-padding-y - $form-multi-select-selection-tags-padding-y - $form-multi-select-tag-margin-y), $form-multi-select-tag-border-width) !default;
1223+
$form-multi-select-tag-padding-x: .5rem !default;
12201224

12211225
$form-multi-select-search-color: $input-color !default;
12221226
$form-multi-select-search-bg: $input-bg !default;
@@ -1289,7 +1293,7 @@ $form-multi-select-padding-y-sm: $input-padding-y-sm !default;
12891293
$form-multi-select-padding-x-sm: $input-padding-x-sm !default;
12901294
$form-multi-select-font-size-sm: $input-font-size-sm !default;
12911295
$form-multi-select-selection-tags-padding-y-sm: .0675rem !default;
1292-
$form-multi-select-selection-tags-padding-x-sm: .0675rem !default;
1296+
$form-multi-select-selection-tags-padding-x-sm: .125rem !default;
12931297
$form-multi-select-tag-margin-y-sm: .0675rem !default;
12941298
$form-multi-select-tag-margin-x-sm: .0675rem !default;
12951299
$form-multi-select-tag-padding-y-sm: 0 !default;

scss/forms/_form-multi-select.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,13 @@
338338
--#{$prefix}form-multi-select-padding-y: #{$form-multi-select-padding-y-sm};
339339
--#{$prefix}form-multi-select-padding-x: #{$form-multi-select-padding-x-sm};
340340
--#{$prefix}form-multi-select-font-size: #{$form-multi-select-font-size-sm};
341+
--#{$prefix}form-multi-select-border-radius: #{$form-multi-select-border-radius-sm};
341342
--#{$prefix}form-multi-select-selection-tags-padding-x: #{$form-multi-select-selection-tags-padding-x-sm};
342343
--#{$prefix}form-multi-select-tag-padding-y: #{$form-multi-select-tag-padding-y-sm};
343344
--#{$prefix}form-multi-select-tag-padding-x: #{$form-multi-select-tag-padding-x-sm};
344345
--#{$prefix}form-multi-select-tag-margin-y: #{$form-multi-select-tag-margin-y-sm};
345346
--#{$prefix}form-multi-select-tag-margin-x: #{$form-multi-select-tag-margin-x-sm};
347+
--#{$prefix}form-multi-select-tag-border-radius: #{$form-multi-select-tag-border-radius-sm};
346348

347349
&.form-multi-select-selection-tags {
348350
min-height: add(($form-multi-select-padding-y-sm * 2), ($form-multi-select-font-size-sm * $form-multi-select-line-height), ($form-multi-select-border-width * 2));
@@ -357,11 +359,13 @@
357359
--#{$prefix}form-multi-select-padding-y: #{$form-multi-select-padding-y-lg};
358360
--#{$prefix}form-multi-select-padding-x: #{$form-multi-select-padding-x-lg};
359361
--#{$prefix}form-multi-select-font-size: #{$form-multi-select-font-size-lg};
362+
--#{$prefix}form-multi-select-border-radius: #{$form-multi-select-border-radius-lg};
360363
--#{$prefix}form-multi-select-selection-tags-padding-x: #{$form-multi-select-selection-tags-padding-x-lg};
361364
--#{$prefix}form-multi-select-tag-padding-y: #{$form-multi-select-tag-padding-y-lg};
362365
--#{$prefix}form-multi-select-tag-padding-x: #{$form-multi-select-tag-padding-x-lg};
363366
--#{$prefix}form-multi-select-tag-margin-y: #{$form-multi-select-tag-margin-y-lg};
364367
--#{$prefix}form-multi-select-tag-margin-x: #{$form-multi-select-tag-margin-x-lg};
368+
--#{$prefix}form-multi-select-tag-border-radius: #{$form-multi-select-tag-border-radius-lg};
365369

366370
&.form-multi-select-selection-tags {
367371
min-height: add(($form-multi-select-padding-y-lg * 2) + ($form-multi-select-font-size-lg * $form-multi-select-line-height), ($form-multi-select-border-width * 2));

0 commit comments

Comments
 (0)