Skip to content

Commit 2ca4be8

Browse files
committed
Fix border radius calculations.
1 parent 641f197 commit 2ca4be8

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/components/Badge.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ export default {
4343
<style lang="scss" scoped>
4444
@import 'docc-render/styles/_core.scss';
4545
46-
$badge-border-radius: $border-radius - 1px !default;
47-
4846
@mixin badge-variation($color) {
4947
--badge-color: var(--color-badge-#{$color});
5048
--badge-dark-color: var(--color-badge-dark-#{$color});
@@ -58,7 +56,7 @@ $badge-border-radius: $border-radius - 1px !default;
5856
padding: 2px 10px;
5957
white-space: nowrap;
6058
background: none;
61-
border-radius: var(--badge-border-radius, $badge-border-radius);
59+
border-radius: var(--badge-border-radius, calc(#{$border-radius} - 1px));
6260
border-style: var(--badge-border-style, solid);
6361
border-width: var(--badge-border-width, 1px);
6462
margin-left: 10px;

src/components/Filter/FilterInput.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ $input-height: rem(28px);
426426
// Remove Gray Highlight When Tapping Links in Mobile Safari =>
427427
// https://css-tricks.com/snippets/css/remove-gray-highlight-when-tapping-links-in-mobile-safari/
428428
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
429-
border-radius: $small-border-radius + 1;
429+
border-radius: calc(#{$small-border-radius} + 1px);
430430
@include on-keyboard-focus() {
431431
outline: none;
432432
}
@@ -484,8 +484,8 @@ $input-height: rem(28px);
484484
/deep/ ul {
485485
padding: var(--input-vertical-padding) rem(9px);
486486
border: 1px solid transparent;
487-
border-bottom-left-radius: $small-border-radius - 1;
488-
border-bottom-right-radius: $small-border-radius - 1;
487+
border-bottom-left-radius: calc(#{$small-border-radius} - 1px);
488+
border-bottom-right-radius: calc(#{$small-border-radius} - 1px);
489489
490490
@include on-keyboard-focus() {
491491
outline: none;

0 commit comments

Comments
 (0)