Skip to content

Commit eb0463b

Browse files
committed
update: control pill size using parent
1 parent 623fbdf commit eb0463b

File tree

6 files changed

+64
-22
lines changed

6 files changed

+64
-22
lines changed

examples/views/pills.hbs

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,80 @@
11
<div class="heading row">Small Pills</div>
22
<div class="row">
3-
<div class="col-4">
43
<div class="pill-sm">
54
Pill Default
65
</div>
7-
</div>
8-
<div class="col-4">
6+
97
<div class="pill-sm bg-green">
108
Pill Green
119
</div>
12-
</div>
13-
<div class="col-4">
10+
1411
<div class="pill-sm bg-red">
1512
Pill Red
1613
</div>
17-
</div>
1814
</div>
1915

2016

2117
<div class="heading row">Default Pills</div>
2218
<div class="row">
23-
<div class="col-4">
2419
<div class="pill">
2520
Pill Default
2621
</div>
27-
</div>
28-
<div class="col-4 ">
2922
<div class="pill bg-green">
3023
Pill Green
3124
</div>
32-
</div>
33-
<div class="col-4">
25+
26+
3427
<div class="pill bg-red">
3528
Pill Red
3629
</div>
37-
</div>
3830
</div>
3931

4032
<div class="heading row">Large Pills</div>
4133
<div class="row">
42-
<div class="col-4">
4334
<div class="pill-lg">
4435
Pill Default
4536
</div>
46-
</div>
47-
<div class="col-4 ">
37+
4838
<div class="pill-lg bg-green">
4939
Pill Green
5040
</div>
51-
</div>
52-
<div class="col-4">
41+
5342
<div class="pill-lg bg-red">
5443
Pill Red
5544
</div>
45+
</div>
46+
47+
48+
<br>
49+
50+
51+
<div class="heading">Manage pill size by parent</div>
52+
53+
<div class="row small">
54+
<div class="pill">
55+
Parent class=small
56+
</div>
57+
58+
<div class="pill bg-green">
59+
Parent class=small
60+
</div>
61+
62+
<div class="pill bg-red">
63+
Parent class=small
64+
</div>
65+
</div>
66+
67+
<div class="row large">
68+
<div class="pill">
69+
Parent class=large
70+
</div>
71+
72+
<div class="pill bg-green">
73+
Parent class=large
74+
</div>
75+
76+
<div class="pill bg-red">
77+
Parent class=large
5678
</div>
5779
</div>
5880

sass/styles/_objects.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@
5353
@import "objects/o-signup/o-signup";
5454
@import "objects/tab-nav/tab-nav";
5555
@import "objects/o-changedp/o-changedp";
56+
@import "objects/o-pill/o-pill";

sass/styles/_tools.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
@import "tools/tools.border";
99
@import "tools/tools.flexbox";
1010
@import "tools/tools.display";
11+
@import "tools/tools.width";
1112

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.small{
2+
.pill{
3+
@include padding-s(0, 12px);
4+
5+
font-size: $card-sms;
6+
height: 17px;
7+
}
8+
}
9+
10+
.large{
11+
.pill{
12+
@include padding-s(0, 30px);
13+
@include border-radius(30px);
14+
15+
font-size: $font-sm;
16+
height: 45px;
17+
}
18+
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11

2-
32
@mixin dimensions($width: $global-container-width, $height: $global-container-height) {
43
width: $width;
54
height: $height;
65
}
76

8-
@mixin width-fit($moz: true){
9-
width: fit-content;
10-
@if($moz) {width: -moz-fit-content}
11-
}

sass/styles/tools/tools.width.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@mixin width-fit($moz: true, $webkit: true){
2+
width: fit-content;
3+
@if($moz) {width: -moz-fit-content}
4+
@if($webkit) {width: -webkit-fit-content}
5+
}

0 commit comments

Comments
 (0)