Skip to content

Commit 7a66f23

Browse files
castastrophecastastrophe
authored
Merge branch 'master' into spandx-port-fix
2 parents 8fe82f1 + 094575f commit 7a66f23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1799
-1276
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ test/.wct-kludge
4646
# Temp files
4747
*~
4848
*.swp
49+
50+
# Kube assets
51+
docs/resources/_gen/assets

‎elements/pfe-accordion/demo/index.html‎

Lines changed: 135 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<title>PFElements: pfe-accordion Demo</title>
6-
6+
<!-- Stylesheets for testing light DOM styles.
7+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
8+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
9+
-->
710
<link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css" />
8-
911
<noscript>
1012
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">
1113
</noscript>
@@ -18,81 +20,193 @@
1820
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
1921
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
2022
<script>require([
21-
'../pfe-accordion.umd.js'
23+
24+
'../pfe-accordion.umd.js',
25+
'../../pfe-band/pfe-band.umd.js'
2226
])</script>
27+
28+
<style>
29+
body {
30+
font-family: Overpass;
31+
padding: 16px 32px 32px;
32+
}
33+
section {
34+
padding: 2rem;
35+
}
36+
a {
37+
color: var(--pfe-broadcasted--color--ui-link);
38+
}
39+
a:hover {
40+
color: var(--pfe-broadcasted--color--ui-link--hover);
41+
}
42+
a:visited {
43+
color: var(--pfe-broadcasted--color--ui-link--visited);
44+
}
45+
a:focus {
46+
color: var(--pfe-broadcasted--color--ui-link--focus);
47+
}
48+
.dark-background {
49+
background-color: #191e84;
50+
}
51+
.white-background {
52+
background-color: #fff;
53+
}
54+
.med-background {
55+
background-color: #9394ba;
56+
}
57+
.dark-gray-background {
58+
background-color: #222591;
59+
}
60+
.light-gray-background {
61+
background-color: #f8f8f8;
62+
}
63+
64+
</style>
2365
</head>
2466
<body unresolved>
25-
<h1>&lt;pfe-accordion&gt;</h1>
26-
<section>
27-
<pfe-accordion color="lightest">
67+
68+
<section class="light-gray-background">
69+
<h2>&lt;pfe-accordion&gt;</h2><br/>
70+
<pfe-accordion>
2871
<pfe-accordion-header>
29-
<h2>Why do wizards need money if they could just create it?</h2>
72+
<h3>Why do wizards need money if they could just create it?</h3>
3073
</pfe-accordion-header>
3174
<pfe-accordion-panel>
3275
<p>There is legislation that decides what you can conjure and what you can not. Because things that you conjure out of thin air will not last, it is illegal in the wizarding world.</p>
3376
</pfe-accordion-panel>
3477
<pfe-accordion-header>
35-
<h2>Why doesn't Harry have a portrait of his parents?</h2>
78+
<h3>Why doesn't Harry have a portrait of his parents?</h3>
3679
</pfe-accordion-header>
3780
<pfe-accordion-panel>
38-
<p>The characters in the portraits 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>
81+
<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 a href="foobarbaz.com">representation of the individual</a> they depict. A portrait of his parents would not be of much help to Harry.</p>
3982
</pfe-accordion-panel>
4083
<pfe-accordion-header>
41-
<h2>Why is Harry considered a half-blood if both of his parents could use magic?</h2>
84+
<h3>Why is Harry considered a half-blood if both of his parents could use magic?</h3>
4285
</pfe-accordion-header>
4386
<pfe-accordion-panel>
4487
<p>Because Harry's grandparents were not able to do magic. This is generally frowned upon by those who consider themselves pure, such as the Malfoy's or other antagonists.</p>
4588
</pfe-accordion-panel>
4689
<pfe-accordion-header>
47-
<h2>Is Hogwarts the only wizarding school?</h2>
90+
<h3>Is Hogwarts the only wizarding school?</h3>
4891
</pfe-accordion-header>
4992
<pfe-accordion-panel>
5093
<p>No! It has been revealed that there are actually 11 long established and prestigious schools around the globe. These include Castelobruxo in the rainforest of Brazil, Durmstrang Institute (whereas nobody is certain of it’s whereabouts), and Ilvermorny, right here in the United States.</p>
5194
</pfe-accordion-panel>
5295
<pfe-accordion-header>
53-
<h2>Where do the main characters work as adults?</h2>
96+
<h3>Where do the main characters work as adults?</h3>
5497
</pfe-accordion-header>
5598
<pfe-accordion-panel>
5699
<p>Harry and Hermione are at the Ministry: he ends up leading the Auror department. Ron helps George at the joke shop and does very well. Ginny becomes a professional Quidditch player and then sportswriter for the Daily Prophet.</p>
57100
<p><a href="https://www.pottermore.com/collection/characters" target="blank">Read more about the characters</a></p>
58101
</pfe-accordion-panel>
59102
</pfe-accordion>
60103
</section>
61-
<section>
62-
<h2>Striped Accordion</h2>
63-
<pfe-accordion color="striped">
104+
105+
<section class="dark-background" >
106+
<h2 style="color:white;">pfe-accordion on=dark</h2><br/>
107+
<pfe-accordion on="dark">
64108
<pfe-accordion-header>
65-
<h2>Why do wizards need money if they could just create it?</h2>
109+
<h3>Why do wizards need money if they could just create it?</h3>
66110
</pfe-accordion-header>
67111
<pfe-accordion-panel>
68112
<p>There is legislation that decides what you can conjure and what you can not. Because things that you conjure out of thin air will not last, it is illegal in the wizarding world.</p>
69113
</pfe-accordion-panel>
70114
<pfe-accordion-header>
71-
<h2>Why doesn't Harry have a portrait of his parents?</h2>
115+
<h3>Why doesn't Harry have a portrait of his parents?</h3>
72116
</pfe-accordion-header>
73117
<pfe-accordion-panel>
74-
<p>The characters in the portraits 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>
118+
<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 <a href="foobarbaz.com">representation of the individual</a> they depict. A portrait of his parents would not be of much help to Harry.</p>
75119
</pfe-accordion-panel>
76120
<pfe-accordion-header>
77-
<h2>Why is Harry considered a half-blood if both of his parents could use magic?</h2>
121+
<h3>Why is Harry considered a half-blood if both of his parents could use magic?</h3>
78122
</pfe-accordion-header>
79123
<pfe-accordion-panel>
80124
<p>Because Harry's grandparents were not able to do magic. This is generally frowned upon by those who consider themselves pure, such as the Malfoy's or other antagonists.</p>
81125
</pfe-accordion-panel>
82126
<pfe-accordion-header>
83-
<h2>Is Hogwarts the only wizarding school?</h2>
127+
<h3>Is Hogwarts the only wizarding school?</h3>
84128
</pfe-accordion-header>
85129
<pfe-accordion-panel>
86130
<p>No! It has been revealed that there are actually 11 long established and prestigious schools around the globe. These include Castelobruxo in the rainforest of Brazil, Durmstrang Institute (whereas nobody is certain of it’s whereabouts), and Ilvermorny, right here in the United States.</p>
87131
</pfe-accordion-panel>
88132
<pfe-accordion-header>
89-
<h2>Where do the main characters work as adults?</h2>
133+
<h3>Where do the main characters work as adults?</h3>
90134
</pfe-accordion-header>
91135
<pfe-accordion-panel>
92136
<p>Harry and Hermione are at the Ministry: he ends up leading the Auror department. Ron helps George at the joke shop and does very well. Ginny becomes a professional Quidditch player and then sportswriter for the Daily Prophet.</p>
93137
<p><a href="https://www.pottermore.com/collection/characters" target="blank">Read more about the characters</a></p>
94138
</pfe-accordion-panel>
95139
</pfe-accordion>
96140
</section>
141+
<section class="light-gray-background">
142+
<h2>&lt;pfe-accordion&gt; nested</h2><br/>
143+
<pfe-accordion>
144+
145+
<pfe-accordion-header>
146+
<h3>Why do wizards need money if they could just create it?</h3>
147+
</pfe-accordion-header>
148+
<pfe-accordion-panel>
149+
<pfe-accordion>
150+
<pfe-accordion-header>
151+
<h3>Why do wizards need money if they could just create it?</h3>
152+
</pfe-accordion-header>
153+
<pfe-accordion-panel>
154+
<p>There is legislation that decides what you can conjure and what you can not. Because things that you conjure out of thin air will not last, it is illegal in the wizarding world.</p>
155+
</pfe-accordion-panel>
156+
<pfe-accordion-header>
157+
<h3>Why doesn't Harry have a portrait of his parents?</h3>
158+
</pfe-accordion-header>
159+
<pfe-accordion-panel>
160+
<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 <a href="foobarbaz.com">representation of the individual</a> they depict. A portrait of his parents would not be of much help to Harry.</p>
161+
</pfe-accordion-panel>
162+
<pfe-accordion-header>
163+
<h3>Why is Harry considered a half-blood if both of his parents could use magic?</h3>
164+
</pfe-accordion-header>
165+
<pfe-accordion-panel>
166+
<p>Because Harry's grandparents were not able to do magic. This is generally frowned upon by those who consider themselves pure, such as the Malfoy's or other antagonists.</p>
167+
</pfe-accordion-panel>
168+
<pfe-accordion-header>
169+
<h3>Is Hogwarts the only wizarding school?</h3>
170+
</pfe-accordion-header>
171+
<pfe-accordion-panel>
172+
<p>No! It has been revealed that there are actually 11 long established and prestigious schools around the globe. These include Castelobruxo in the rainforest of Brazil, Durmstrang Institute (whereas nobody is certain of it’s whereabouts), and Ilvermorny, right here in the United States.</p>
173+
</pfe-accordion-panel>
174+
<pfe-accordion-header>
175+
<h3>Where do the main characters work as adults?</h3>
176+
</pfe-accordion-header>
177+
<pfe-accordion-panel>
178+
<p>Harry and Hermione are at the Ministry: he ends up leading the Auror department. Ron helps George at the joke shop and does very well. Ginny becomes a professional Quidditch player and then sportswriter for the Daily Prophet.</p>
179+
<p><a href="https://www.pottermore.com/collection/characters" target="blank">Read more about the characters</a></p>
180+
</pfe-accordion-panel>
181+
</pfe-accordion>
182+
</pfe-accordion-panel>
183+
<pfe-accordion-header>
184+
<h3>Why doesn't Harry have a portrait of his parents?</h3>
185+
</pfe-accordion-header>
186+
<pfe-accordion-panel>
187+
<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 <a href="foobarbaz.com">representation of the individual</a> they depict. A portrait of his parents would not be of much help to Harry.</p>
188+
</pfe-accordion-panel>
189+
<pfe-accordion-header>
190+
<h3>Why is Harry considered a half-blood if both of his parents could use magic?</h3>
191+
</pfe-accordion-header>
192+
<pfe-accordion-panel>
193+
<p>Because Harry's grandparents were not able to do magic. This is generally frowned upon by those who consider themselves pure, such as the Malfoy's or other antagonists.</p>
194+
</pfe-accordion-panel>
195+
<pfe-accordion-header>
196+
<h3>Is Hogwarts the only wizarding school?</h3>
197+
</pfe-accordion-header>
198+
<pfe-accordion-panel>
199+
<p>No! It has been revealed that there are actually 11 long established and prestigious schools around the globe. These include Castelobruxo in the rainforest of Brazil, Durmstrang Institute (whereas nobody is certain of it’s whereabouts), and Ilvermorny, right here in the United States.</p>
200+
</pfe-accordion-panel>
201+
<pfe-accordion-header>
202+
<h3>Where do the main characters work as adults?</h3>
203+
</pfe-accordion-header>
204+
<pfe-accordion-panel>
205+
<p>Harry and Hermione are at the Ministry: he ends up leading the Auror department. Ron helps George at the joke shop and does very well. Ginny becomes a professional Quidditch player and then sportswriter for the Daily Prophet.</p>
206+
<p><a href="https://www.pottermore.com/collection/characters" target="blank">Read more about the characters</a></p>
207+
</pfe-accordion-panel>
208+
</pfe-accordion>
209+
</section>
210+
97211
</body>
98212
</html>

‎elements/pfe-accordion/demo/pfe-accordion.story.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,19 @@ stories.add(PfeAccordion.tag, () => {
2020
let config = {};
2121
// const props = PfeAccordion.properties;
2222
// const slots = PfeAccordion.slots;
23+
const props = {
24+
on: {
25+
title: "Theme",
26+
type: "string",
27+
enum: [
28+
"light",
29+
"dark"
30+
],
31+
default: "light"
32+
}
33+
};
34+
35+
config.prop = tools.autoPropKnobs(props, storybookBridge);
2336

2437
//-- Add content to light DOM
2538
config.slots = [];

‎elements/pfe-accordion/package-lock.json‎

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

‎elements/pfe-accordion/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"className": "PfeAccordion",
55
"elementName": "pfe-accordion"
66
},
7-
"version": "1.0.0-prerelease.9",
7+
"version": "1.0.0-prerelease.10",
88
"publishConfig": {
99
"access": "public"
1010
},
@@ -24,8 +24,8 @@
2424
},
2525
"license": "MIT",
2626
"dependencies": {
27-
"@patternfly/pfe-sass": "^1.0.0-prerelease.9",
28-
"@patternfly/pfelement": "^1.0.0-prerelease.9"
27+
"@patternfly/pfe-sass": "^1.0.0-prerelease.10",
28+
"@patternfly/pfelement": "^1.0.0-prerelease.10"
2929
},
3030
"generator-pfelement-version": "0.5.5",
3131
"gitHead": "dfa74e0495c556ebdd1edb61c6d406621d1b6421"

0 commit comments

Comments
 (0)