Skip to content

Commit cf0e3f7

Browse files
authored
Merge branch 'master' into pfe-content-set-fix
2 parents 547d87c + 20fc9d2 commit cf0e3f7

File tree

5 files changed

+42
-11
lines changed

5 files changed

+42
-11
lines changed

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

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
<head>
44
<meta charset="utf-8">
55
<title>PatternFly Element | pfe-content-set Demo</title>
6-
7-
<noscript>
8-
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">
9-
</noscript>
10-
11-
<link href="../../pfelement/pfelement.min.css" rel="stylesheet">
12-
136
<!-- uncomment the es5-adapter if you're using the umd version -->
147
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.7/custom-elements-es5-adapter.js"></script>
158
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.7/webcomponents-bundle.js"></script>
@@ -19,7 +12,39 @@
1912
"../../../themes/cp-theme/cp-theme.umd.js",
2013
"../pfe-content-set.umd.js"
2114
])
22-
</script>
15+
</script>
16+
17+
<noscript>
18+
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">
19+
</noscript>
20+
<style>
21+
h1, h2 {
22+
margin-bottom: .3em;
23+
}
24+
h2 {
25+
color: var(--pfe-theme--color--ui-accent, #c00);
26+
font-size: 1.2em;
27+
text-transform: uppercase;
28+
}
29+
h2 a {
30+
color: inherit;
31+
cursor: pointer;
32+
}
33+
h3 {
34+
font-size: 1.4em;
35+
color: var(--pfe-theme--color--ui-complement, #464646);
36+
}
37+
p {
38+
margin-top: 0 !important;
39+
}
40+
hr {
41+
margin: 40px 10px;
42+
border-color: transparent;
43+
border-bottom-color: #ccc;
44+
}
45+
</style>
46+
47+
<link href="../../pfelement/pfelement.min.css" rel="stylesheet">
2348
<style>
2449
.cta a {
2550
display: inline-block;
@@ -209,7 +234,7 @@ <h2 pfe-content-set--header>Heading 3</h2>
209234
</pfe-content-set>
210235
</div>
211236

212-
<!-- <pfe-content-set>
237+
<pfe-content-set>
213238
<h2 pfe-content-set--header>Heading 1</h2>
214239
<div pfe-content-set--panel>
215240
<p>Content for heading 1.</p>
@@ -219,8 +244,8 @@ <h2 pfe-content-set--header>Heading 1</h2>
219244
</div>
220245
<h2 pfe-content-set--header>Heading 2</h2>
221246
<div pfe-content-set--panel>Content for heading 2.</div>
222-
</pfe-content-set>-->
247+
</pfe-content-set>
223248

224249

225250
</body>
226-
</html>
251+
</html>

elements/pfe-content-set/pfe-content-set.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

elements/pfe-content-set/pfe-content-set.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

elements/pfe-content-set/pfe-content-set.umd.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)