Skip to content

Commit 51b7661

Browse files
stephenwadestephenwade
committed
sort border-radius with border
1 parent 7c6a2f4 commit 51b7661

File tree

2 files changed

+35
-34
lines changed

2 files changed

+35
-34
lines changed

‎index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ function border (infix) {
3131
'border' + infix,
3232
'border' + infix + '-width',
3333
'border' + infix + '-style',
34-
'border' + infix + '-color'
34+
'border' + infix + '-color',
35+
'border' + infix + '-radius'
3536
]
3637
}
3738

‎test/expected.css

+33-33
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ mark,
487487
height: auto;
488488
padding: 0.25rem;
489489
border: 1px solid #dee2e6;
490-
background-color: #fff;
491490
border-radius: 0.25rem;
491+
background-color: #fff;
492492
}
493493

494494
.figure {
@@ -517,8 +517,8 @@ a > code {
517517

518518
kbd {
519519
padding: 0.2rem 0.4rem;
520-
background-color: #212529;
521520
border-radius: 0.2rem;
521+
background-color: #212529;
522522
color: #fff;
523523
font-size: 87.5%;
524524
}
@@ -1861,9 +1861,9 @@ pre code {
18611861
height: calc(1.5em + 0.75rem + 2px);
18621862
padding: 0.375rem 0.75rem;
18631863
border: 1px solid #ced4da;
1864+
border-radius: 0.25rem;
18641865
background-clip: padding-box;
18651866
background-color: #fff;
1866-
border-radius: 0.25rem;
18671867
color: #495057;
18681868
font-size: 1rem;
18691869
font-weight: 400;
@@ -2070,9 +2070,9 @@ textarea.form-control {
20702070
display: none;
20712071
max-width: 100%;
20722072
padding: 0.25rem 0.5rem;
2073+
border-radius: 0.25rem;
20732074
margin-top: .1rem;
20742075
background-color: rgba(40, 167, 69, 0.9);
2075-
border-radius: 0.25rem;
20762076
color: #fff;
20772077
font-size: 0.875rem;
20782078
line-height: 1.5;
@@ -2193,9 +2193,9 @@ textarea.form-control {
21932193
display: none;
21942194
max-width: 100%;
21952195
padding: 0.25rem 0.5rem;
2196+
border-radius: 0.25rem;
21962197
margin-top: .1rem;
21972198
background-color: rgba(220, 53, 69, 0.9);
2198-
border-radius: 0.25rem;
21992199
color: #fff;
22002200
font-size: 0.875rem;
22012201
line-height: 1.5;
@@ -2380,8 +2380,8 @@ textarea.form-control {
23802380
display: inline-block;
23812381
padding: 0.375rem 0.75rem;
23822382
border: 1px solid transparent;
2383-
background-color: transparent;
23842383
border-radius: 0.25rem;
2384+
background-color: transparent;
23852385
color: #212529;
23862386
font-size: 1rem;
23872387
font-weight: 400;
@@ -3064,10 +3064,10 @@ input[type="button"].btn-block {
30643064
min-width: 10rem;
30653065
padding: 0.5rem 0;
30663066
border: 1px solid rgba(0, 0, 0, 0.15);
3067+
border-radius: 0.25rem;
30673068
margin: 0.125rem 0 0;
30683069
background-clip: padding-box;
30693070
background-color: #fff;
3070-
border-radius: 0.25rem;
30713071
color: #212529;
30723072
float: left;
30733073
font-size: 1rem;
@@ -3523,9 +3523,9 @@ input[type="button"].btn-block {
35233523
align-items: center;
35243524
padding: 0.375rem 0.75rem;
35253525
border: 1px solid #ced4da;
3526+
border-radius: 0.25rem;
35263527
margin-bottom: 0;
35273528
background-color: #e9ecef;
3528-
border-radius: 0.25rem;
35293529
color: #495057;
35303530
-ms-flex-align: center;
35313531
font-size: 1rem;
@@ -3729,8 +3729,8 @@ input[type="button"].btn-block {
37293729
left: calc(-2.25rem + 2px);
37303730
width: calc(1rem - 4px);
37313731
height: calc(1rem - 4px);
3732-
background-color: #adb5bd;
37333732
border-radius: 0.5rem;
3733+
background-color: #adb5bd;
37343734
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out;
37353735
transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
37363736
transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out;
@@ -3758,12 +3758,12 @@ input[type="button"].btn-block {
37583758
height: calc(1.5em + 0.75rem + 2px);
37593759
padding: 0.375rem 1.75rem 0.375rem 0.75rem;
37603760
border: 1px solid #ced4da;
3761+
border-radius: 0.25rem;
37613762
-webkit-appearance: none;
37623763
-moz-appearance: none;
37633764
appearance: none;
37643765
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
37653766
background-color: #fff;
3766-
border-radius: 0.25rem;
37673767
color: #495057;
37683768
font-size: 1rem;
37693769
font-weight: 400;
@@ -3856,8 +3856,8 @@ input[type="button"].btn-block {
38563856
height: calc(1.5em + 0.75rem + 2px);
38573857
padding: 0.375rem 0.75rem;
38583858
border: 1px solid #ced4da;
3859-
background-color: #fff;
38603859
border-radius: 0.25rem;
3860+
background-color: #fff;
38613861
color: #495057;
38623862
font-weight: 400;
38633863
line-height: 1.5;
@@ -3872,9 +3872,9 @@ input[type="button"].btn-block {
38723872
display: block;
38733873
height: calc(1.5em + 0.75rem);
38743874
padding: 0.375rem 0.75rem;
3875+
border-radius: 0 0.25rem 0.25rem 0;
38753876
border-left: inherit;
38763877
background-color: #e9ecef;
3877-
border-radius: 0 0.25rem 0.25rem 0;
38783878
color: #495057;
38793879
content: "Browse";
38803880
line-height: 1.5;
@@ -3914,11 +3914,11 @@ input[type="button"].btn-block {
39143914
width: 1rem;
39153915
height: 1rem;
39163916
border: 0;
3917+
border-radius: 1rem;
39173918
margin-top: -0.25rem;
39183919
-webkit-appearance: none;
39193920
appearance: none;
39203921
background-color: #007bff;
3921-
border-radius: 1rem;
39223922
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
39233923
}
39243924

@@ -3936,8 +3936,8 @@ input[type="button"].btn-block {
39363936
width: 100%;
39373937
height: 0.5rem;
39383938
border-color: transparent;
3939-
background-color: #dee2e6;
39403939
border-radius: 1rem;
3940+
background-color: #dee2e6;
39413941
color: transparent;
39423942
cursor: pointer;
39433943
}
@@ -3946,10 +3946,10 @@ input[type="button"].btn-block {
39463946
width: 1rem;
39473947
height: 1rem;
39483948
border: 0;
3949+
border-radius: 1rem;
39493950
-moz-appearance: none;
39503951
appearance: none;
39513952
background-color: #007bff;
3952-
border-radius: 1rem;
39533953
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
39543954
}
39553955

@@ -3967,8 +3967,8 @@ input[type="button"].btn-block {
39673967
width: 100%;
39683968
height: 0.5rem;
39693969
border-color: transparent;
3970-
background-color: #dee2e6;
39713970
border-radius: 1rem;
3971+
background-color: #dee2e6;
39723972
color: transparent;
39733973
cursor: pointer;
39743974
}
@@ -3977,12 +3977,12 @@ input[type="button"].btn-block {
39773977
width: 1rem;
39783978
height: 1rem;
39793979
border: 0;
3980+
border-radius: 1rem;
39803981
margin-top: 0;
39813982
margin-right: 0.2rem;
39823983
margin-left: 0.2rem;
39833984
appearance: none;
39843985
background-color: #007bff;
3985-
border-radius: 1rem;
39863986
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
39873987
}
39883988

@@ -4007,14 +4007,14 @@ input[type="button"].btn-block {
40074007
}
40084008

40094009
.custom-range::-ms-fill-lower {
4010-
background-color: #dee2e6;
40114010
border-radius: 1rem;
4011+
background-color: #dee2e6;
40124012
}
40134013

40144014
.custom-range::-ms-fill-upper {
4015+
border-radius: 1rem;
40154016
margin-right: 15px;
40164017
background-color: #dee2e6;
4017-
border-radius: 1rem;
40184018
}
40194019

40204020
.custom-range:disabled::-webkit-slider-thumb {
@@ -4222,8 +4222,8 @@ input[type="button"].btn-block {
42224222
.navbar-toggler {
42234223
padding: 0.25rem 0.75rem;
42244224
border: 1px solid transparent;
4225-
background-color: transparent;
42264225
border-radius: 0.25rem;
4226+
background-color: transparent;
42274227
font-size: 1.25rem;
42284228
line-height: 1;
42294229
}
@@ -4558,9 +4558,9 @@ input[type="button"].btn-block {
45584558
-ms-flex-direction: column;
45594559
flex-direction: column;
45604560
border: 1px solid rgba(0, 0, 0, 0.125);
4561+
border-radius: 0.25rem;
45614562
background-clip: border-box;
45624563
background-color: #fff;
4563-
border-radius: 0.25rem;
45644564
word-wrap: break-word;
45654565
}
45664566

@@ -4781,8 +4781,8 @@ input[type="button"].btn-block {
47814781
}
47824782

47834783
.accordion > .card:not(:first-of-type):not(:last-of-type) {
4784-
border-bottom: 0;
47854784
border-radius: 0;
4785+
border-bottom: 0;
47864786
}
47874787

47884788
.accordion > .card:first-of-type {
@@ -4806,9 +4806,9 @@ input[type="button"].btn-block {
48064806
-ms-flex-wrap: wrap;
48074807
flex-wrap: wrap;
48084808
padding: 0.75rem 1rem;
4809+
border-radius: 0.25rem;
48094810
margin-bottom: 1rem;
48104811
background-color: #e9ecef;
4811-
border-radius: 0.25rem;
48124812
list-style: none;
48134813
}
48144814

@@ -5086,9 +5086,9 @@ a.badge-dark:focus, a.badge-dark.focus {
50865086

50875087
.jumbotron {
50885088
padding: 2rem 1rem;
5089+
border-radius: 0.3rem;
50895090
margin-bottom: 2rem;
50905091
background-color: #e9ecef;
5091-
border-radius: 0.3rem;
50925092
}
50935093

50945094
@media (min-width: 576px) {
@@ -5107,8 +5107,8 @@ a.badge-dark:focus, a.badge-dark.focus {
51075107
position: relative;
51085108
padding: 0.75rem 1.25rem;
51095109
border: 1px solid transparent;
5110-
margin-bottom: 1rem;
51115110
border-radius: 0.25rem;
5111+
margin-bottom: 1rem;
51125112
}
51135113

51145114
.alert-heading {
@@ -5266,8 +5266,8 @@ a.badge-dark:focus, a.badge-dark.focus {
52665266
display: flex;
52675267
overflow: hidden;
52685268
height: 1rem;
5269-
background-color: #e9ecef;
52705269
border-radius: 0.25rem;
5270+
background-color: #e9ecef;
52715271
font-size: 0.75rem;
52725272
}
52735273

@@ -5492,9 +5492,9 @@ a.badge-dark:focus, a.badge-dark.focus {
54925492
}
54935493

54945494
.list-group-flush .list-group-item {
5495+
border-radius: 0;
54955496
border-right: 0;
54965497
border-left: 0;
5497-
border-radius: 0;
54985498
}
54995499

55005500
.list-group-flush .list-group-item:last-child {
@@ -5674,11 +5674,11 @@ a.close.disabled {
56745674
overflow: hidden;
56755675
max-width: 350px;
56765676
border: 1px solid rgba(0, 0, 0, 0.1);
5677+
border-radius: 0.25rem;
56775678
-webkit-backdrop-filter: blur(10px);
56785679
backdrop-filter: blur(10px);
56795680
background-clip: padding-box;
56805681
background-color: rgba(255, 255, 255, 0.85);
5681-
border-radius: 0.25rem;
56825682
box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
56835683
font-size: 0.875rem;
56845684
opacity: 0;
@@ -5823,9 +5823,9 @@ a.close.disabled {
58235823
-ms-flex-direction: column;
58245824
flex-direction: column;
58255825
border: 1px solid rgba(0, 0, 0, 0.2);
5826+
border-radius: 0.3rem;
58265827
background-clip: padding-box;
58275828
background-color: #fff;
5828-
border-radius: 0.3rem;
58295829
outline: 0;
58305830
pointer-events: auto;
58315831
}
@@ -6047,8 +6047,8 @@ a.close.disabled {
60476047
.tooltip-inner {
60486048
max-width: 200px;
60496049
padding: 0.25rem 0.5rem;
6050-
background-color: #000;
60516050
border-radius: 0.25rem;
6051+
background-color: #000;
60526052
color: #fff;
60536053
text-align: center;
60546054
}
@@ -6061,9 +6061,9 @@ a.close.disabled {
60616061
display: block;
60626062
max-width: 276px;
60636063
border: 1px solid rgba(0, 0, 0, 0.2);
6064+
border-radius: 0.3rem;
60646065
background-clip: padding-box;
60656066
background-color: #fff;
6066-
border-radius: 0.3rem;
60676067
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
60686068
font-size: 0.875rem;
60696069
font-style: normal;
@@ -6434,10 +6434,10 @@ a.close.disabled {
64346434
width: 2rem;
64356435
height: 2rem;
64366436
border: 0.25em solid currentColor;
6437+
border-radius: 50%;
64376438
border-right-color: transparent;
64386439
-webkit-animation: spinner-border .75s linear infinite;
64396440
animation: spinner-border .75s linear infinite;
6440-
border-radius: 50%;
64416441
vertical-align: text-bottom;
64426442
}
64436443

@@ -6471,10 +6471,10 @@ a.close.disabled {
64716471
display: inline-block;
64726472
width: 2rem;
64736473
height: 2rem;
6474+
border-radius: 50%;
64746475
-webkit-animation: spinner-grow .75s linear infinite;
64756476
animation: spinner-grow .75s linear infinite;
64766477
background-color: currentColor;
6477-
border-radius: 50%;
64786478
opacity: 0;
64796479
vertical-align: text-bottom;
64806480
}

0 commit comments

Comments
 (0)