Skip to content

Commit 2c950b0

Browse files
fix: Add clearfix to tabs & accordions, in case of floating content (#835)
* Add clearfix to tabs & accordions, in case of floating content * Update demo pages with floating cards
1 parent 27fee5f commit 2c950b0

File tree

6 files changed

+46
-14
lines changed

6 files changed

+46
-14
lines changed

CHANGELOG-prerelease.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Prerelese 46 ( TBD )
22

3-
- []() fix: pfe-tabs check for tagName on addedNode mutation before continuing
3+
- [27fee5f](https://github.com/patternfly/patternfly-elements/commit/27fee5f5c5eb021ac126f3767dd0299f5cda8231) fix: pfe-tabs check for tagName on addedNode mutation before continuing
4+
- [](https://github.com/patternfly/patternfly-elements/commit/) fix: Add clearfix within tab and accordion panels
45

56
## Prerelese 45 ( 2020-04-27 )
67

elements/pfe-accordion/demo/index.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@
9090
.custom-styles h2 {
9191
margin-top: 0;
9292
}
93+
.floating-card {
94+
float: left;
95+
width:48%;
96+
margin-right:2%;
97+
border: #eee solid 1px;
98+
padding: 20px;
99+
}
93100
</style>
94101

95102
<pfe-band pfe-color="lightest">
@@ -121,12 +128,15 @@ <h3>Panel with multiple paragraphs</h3>
121128
</pfe-accordion>
122129
</pfe-accordion-panel>
123130
<pfe-accordion-header>
124-
<h3>Panel with links</h3>
131+
<h3>Panel with links & floating cards</h3>
125132
</pfe-accordion-header>
126133
<pfe-accordion-panel>
127-
<p><a href="#">The characters in the portraits</a> are not actually ghosts. They mainly are there just to
128-
repeat common phrases or serve as a general representation of the individual
129-
they depict. A portrait of his parents would not be of much help to Harry.</p>
134+
<div class="floating-card">
135+
<p><a href="#">The characters in the portraits</a> are not actually ghosts. They mainly are there just to repeat common phrases or serve as a general representation of the individual they depict. A portrait of his parents would not be of much help to Harry.</p>
136+
</div>
137+
<div class="floating-card">
138+
<p>Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
139+
</div>
130140
</pfe-accordion-panel>
131141
<pfe-accordion-header>
132142
<h3>Panel with CTA</h3>

elements/pfe-accordion/src/pfe-accordion-panel.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $LOCAL: accordion;
1919
}
2020

2121
.container {
22+
@include pfe-clearfix;
2223
@include pfe-panel-container;
2324
--pfe-accordion--panel-container--Padding: 0 calc(#{pfe-local(base--Padding)} * 3) #{pfe-local(base--Padding)} calc(#{pfe-local(base--Padding)} * 1.5);
2425
}

elements/pfe-content-set/demo/index.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@
8989
color: white;
9090
float: right;
9191
}
92+
.floating-card {
93+
float: left;
94+
width:48%;
95+
margin-right:2%;
96+
border: #eee solid 1px;
97+
padding: 20px;
98+
}
9299

93100
</style>
94101
</head>
@@ -118,14 +125,17 @@ <h4 pfe-content-set--header>Heading 2</h4>
118125
porta gravida at eget metus. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus
119126
mollis interdum.</div>
120127
<h4 pfe-content-set--header>Heading 3</h4>
121-
<div pfe-content-set--panel>Content for heading 3. Donec ullamcorper nulla non metus auctor fringilla. Donec
122-
ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Aenean eu leo
123-
quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet
124-
fermentum.</div>
128+
<div pfe-content-set--panel>
129+
<div class="floating-card">
130+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
131+
</div>
132+
<div class="floating-card">
133+
<p>Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
134+
</div>
135+
</div>
125136
</pfe-content-set>
126137
</section>
127138

128-
129139
<section class="faux-container" style="max-width: 800px">
130140
<h4 class="label">Default pfe-content-set in a 800px container</h4>
131141

elements/pfe-tabs/demo/index.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
.dark-background {
5656
background-color: #000;
5757
}
58+
.floating-card {
59+
float: left;
60+
width:48%;
61+
margin-right:2%;
62+
border: #eee solid 1px;
63+
padding: 20px;
64+
}
5865
</style>
5966

6067
<noscript>
@@ -96,10 +103,12 @@ <h2>Content 2</h2>
96103
<pfe-tab role="heading" slot="tab" id="tab3">Tab 3</pfe-tab>
97104
<pfe-tab-panel role="region" slot="panel">
98105
<h2>Content 3</h2>
99-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
100-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
101-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
102-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
106+
<div class="floating-card">
107+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
108+
</div>
109+
<div class="floating-card">
110+
<p>Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
111+
</div>
103112
</pfe-tab-panel>
104113
</pfe-tabs>
105114

elements/pfe-tabs/src/pfe-tab-panel.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ $variables: (
3333
border-bottom: #{pfe-local($cssvar: BorderBottom, $region: panel, $fallback: 0)};
3434
border-left: #{pfe-local($cssvar: BorderLeft, $region: panel, $fallback: 0)};
3535

36+
@include pfe-clearfix;
3637
@include browser-query(ie11) {
3738
padding: 1em;
3839
background-color: #{map-get($pfe-colors, surface--lightest)} !important;

0 commit comments

Comments
 (0)