Skip to content

Commit e5c6950

Browse files
authored
fix: div isn't allowed in button elements (#1438)
1 parent ab6b133 commit e5c6950

File tree

3 files changed

+16
-27
lines changed

3 files changed

+16
-27
lines changed

packages/uikit-workshop/src/sass/scss/04-components/_pattern.scss

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@
7474
font-size: 0.8rem;
7575
margin-bottom: -1px;
7676
padding: 0.4rem 0.5rem;
77+
padding-right: 1.75rem;
7778
color: $pl-color-gray-55;
7879
background-color: transparent;
7980
cursor: pointer;
8081
font-weight: normal;
8182
transition: all $pl-animate-quick ease-out;
8283
font-family: $pl-font;
8384
border-color: #ddd;
84-
border-width: 1px; // fix for different browser defaults
85+
border-width: 1px; // fix for different browser defaults
8586
border-style: solid; // fix for different browser defaults (ex. Safari)
8687
display: flex;
8788
align-items: center;
@@ -103,22 +104,14 @@
103104
}
104105
}
105106

106-
.pl-c-pattern__toggle-icon-wrapper {
107-
position: relative;
108-
height: 1rem;
109-
width: 1rem;
110-
}
111-
112107
.pl-c-pattern__toggle-icon {
113108
height: 0.9rem;
114109
width: 0.9rem;
115110
display: inline-block;
116111
vertical-align: middle;
117112
position: absolute;
118-
top: 50%;
119-
left: 50%;
120-
transform: translate3d(-50%, -50%, 0);
121-
transition: transform .1s linear, opacity .1s linear;
113+
right: .625rem;
114+
transition: opacity .1s linear;
122115
}
123116

124117
.pl-c-pattern__toggle-icon--expand {
@@ -140,7 +133,7 @@
140133
}
141134
}
142135

143-
.pl-c-pattern__extra-toggle-text ~ .pl-c-pattern__toggle-icon-wrapper {
136+
.pl-c-pattern__extra-toggle-text ~ svg {
144137
margin-left: 0.25rem;
145138
}
146139

packages/uikit-workshop/views-twig/partials/patternSection.twig

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@
1919
<button class="pl-c-pattern__extra-toggle pl-js-pattern-extra-toggle" id="pl-pattern-extra-toggle-{{partial.patternPartial}}" data-patternpartial="{{ partial.patternPartial }}" title="View Pattern Info">
2020
<span class="pl-c-pattern__extra-toggle-text pl-c-pattern__extra-toggle-text--expand">Expand</span>
2121
<span class="pl-c-pattern__extra-toggle-text pl-c-pattern__extra-toggle-text--collapse">Collapse</span>
22-
<div class="pl-c-pattern__toggle-icon-wrapper" aria-hidden="true">
23-
<svg viewBox="0 0 16 16" width="20" height="20" class="pl-c-pattern__toggle-icon pl-c-pattern__toggle-icon--expand">
24-
<path fill="currentColor" d="M9 11.5l1.5 1.5 5-5-5-5-1.5 1.5 3.5 3.5z"></path>
25-
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
26-
</svg>
27-
28-
<svg viewBox="0 0 20 16" width="20" height="20" class="pl-c-pattern__toggle-icon pl-c-pattern__toggle-icon--collapse">
29-
<path fill="currentColor" d="M13 11.5l1.5 1.5 5-5-5-5-1.5 1.5 3.5 3.5z"></path>
30-
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
31-
<path fill="currentColor" d="M10.958 2.352l1.085 0.296-3 11-1.085-0.296 3-11z"></path>
32-
</svg>
33-
</div>
22+
<svg viewBox="0 0 16 16" width="20" height="20" class="pl-c-pattern__toggle-icon pl-c-pattern__toggle-icon--expand">
23+
<path fill="currentColor" d="M9 11.5l1.5 1.5 5-5-5-5-1.5 1.5 3.5 3.5z"></path>
24+
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
25+
</svg>
26+
27+
<svg viewBox="0 0 20 16" width="20" height="20" class="pl-c-pattern__toggle-icon pl-c-pattern__toggle-icon--collapse">
28+
<path fill="currentColor" d="M13 11.5l1.5 1.5 5-5-5-5-1.5 1.5 3.5 3.5z"></path>
29+
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
30+
<path fill="currentColor" d="M10.958 2.352l1.085 0.296-3 11-1.085-0.296 3-11z"></path>
31+
</svg>
3432
</button>
3533
</div><!--end pl-c-pattern__header-->
3634

packages/uikit-workshop/views/partials/patternSection.mustache

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<button class="pl-c-pattern__extra-toggle pl-js-pattern-extra-toggle" id="pl-pattern-extra-toggle-{{ patternPartial }}" data-patternpartial="{{ patternPartial }}" title="View Pattern Info">
1919
<span class="pl-c-pattern__extra-toggle-text pl-c-pattern__extra-toggle-text--expand">Expand</span>
2020
<span class="pl-c-pattern__extra-toggle-text pl-c-pattern__extra-toggle-text--collapse">Collapse</span>
21-
<div class="pl-c-pattern__toggle-icon-wrapper" aria-hidden="true">
2221
<svg viewBox="0 0 16 16" width="20" height="20" class="pl-c-pattern__toggle-icon pl-c-pattern__toggle-icon--expand">
2322
<path fill="currentColor" d="M9 11.5l1.5 1.5 5-5-5-5-1.5 1.5 3.5 3.5z"></path>
2423
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
@@ -29,7 +28,6 @@
2928
<path fill="currentColor" d="M7 4.5l-1.5-1.5-5 5 5 5 1.5-1.5-3.5-3.5z"></path>
3029
<path fill="currentColor" d="M10.958 2.352l1.085 0.296-3 11-1.085-0.296 3-11z"></path>
3130
</svg>
32-
</div>
3331
</button>
3432

3533
</div><!--end pl-c-pattern__header-->
@@ -45,4 +43,4 @@
4543
{{{ patternData }}}
4644
</script>
4745

48-
</div><!--end pl-c-pattern-->
46+
</div><!--end pl-c-pattern-->

0 commit comments

Comments
 (0)