Skip to content

Commit 7454e85

Browse files
author
castastrophe
committed
Merge branch 'master' of github.com:patternfly/patternfly-elements into US206196--modal-web-component
2 parents bf0d2b0 + c549734 commit 7454e85

File tree

40 files changed

+493
-51
lines changed

40 files changed

+493
-51
lines changed

docs/content/develop/step-2b.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ We'll also need to update `/demo/index.html` so that the user's name is passed i
3939
<link href="../../pfelement/pfelement.min.css" rel="stylesheet">
4040
4141
<!-- uncomment the es5-adapter if you're using the umd version -->
42-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
43-
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
42+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
43+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script>
4444
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
4545
<script>require(['../pfe-cool-element.umd.js'])</script>
4646
</head>

elements/pfe-accordion/demo/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
88
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
99
-->
10-
<link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css" />
10+
<link rel="stylesheet" href="https://overpass-30e2.kxcdn.com/overpass.css" />
1111
<noscript>
1212
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">
1313
</noscript>
@@ -16,8 +16,8 @@
1616

1717

1818
<!-- uncomment the es5-adapter if you're using the umd version -->
19-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
20-
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
19+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
20+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script>
2121
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
2222
<script>require([
2323

elements/pfe-autocomplete/demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<link href="../../pfelement/pfelement.min.css" rel="stylesheet">
1212

1313
<!-- uncomment the es5-adapter if you're using the umd version -->
14-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
15-
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
14+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
15+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script>
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
1717
<script>require([
1818
'../pfe-autocomplete.umd.js'

elements/pfe-avatar/demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.5.2/vue.min.js"></script>
1414

1515
<!-- uncomment the es5-adapter if you're using the umd version -->
16-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
17-
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
17+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script>
1818
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
1919
<script>require(['../pfe-avatar.umd.js'])</script>
2020

elements/pfe-band/demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<link href="../../pfe-layouts/pfe-layouts.css" rel="stylesheet">
1818

1919
<!-- uncomment the es5-adapter if you're using the umd version -->
20-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
20+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
2121

2222
<!-- Use webcomponents-loader when you are adding support for more modern browsers -->
23-
<!-- <script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
23+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script> -->
2424

2525
<!-- IE11 test: use bundle + require with umd files -->
2626
<!-- Use webcomponents-bundle when supporting much older browsers like IE11 -->

elements/pfe-card/demo/index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>PFElements: pfe-card Demo</title>
77
<!-- uncomment the es5-adapter if you're using the umd version -->
8-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
9-
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
8+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script>
1010
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
1111

1212
<!--
@@ -118,7 +118,7 @@ <h2 slot="pfe-card--header">Accent Card</h2>
118118

119119
<div class="demo-cards">
120120
<pfe-card pfe-color="lighter">
121-
<img src="http://placekitten.com/200/150"/>
121+
<img src="https://placekitten.com/200/150"/>
122122
<h2>Imaged card with no overflow</h2>
123123
<p>Lorem ipsum dolor sit, amet consectetur adipisicing elit.</p>
124124
<pfe-cta slot="pfe-card--footer">
@@ -127,7 +127,7 @@ <h2>Imaged card with no overflow</h2>
127127
</pfe-card>
128128

129129
<pfe-card pfe-color="lighter">
130-
<img pfe-overflow="top right left" src="http://placekitten.com/600/300"/>
130+
<img pfe-overflow="top right left" src="https://placekitten.com/600/300"/>
131131
<h2>Imaged card with top & side overflow</h2>
132132
<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quaerat porro similique saepe tempora vel! Facilis, porro?</p>
133133
<pfe-cta slot="pfe-card--footer">
@@ -137,7 +137,7 @@ <h2>Imaged card with top & side overflow</h2>
137137

138138
<pfe-card pfe-color="lighter" class="custom-header-background">
139139
<h2 slot="pfe-card--header">Imaged card with side overflow + header</h2>
140-
<img pfe-overflow="top right left" src="http://placekitten.com/500/250"/>
140+
<img pfe-overflow="top right left" src="https://placekitten.com/500/250"/>
141141
<p style="margin-top: 10px;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Quaerat porro similique saepe tempora vel! Facilis, porro?</p>
142142
<pfe-cta slot="pfe-card--footer">
143143
<a href="#">Learn more</a>
@@ -146,7 +146,7 @@ <h2 slot="pfe-card--header">Imaged card with side overflow + header</h2>
146146

147147
<pfe-card pfe-color="lighter">
148148
<h2>Imaged card with side overflow</h2>
149-
<img pfe-overflow="right left" src="http://placekitten.com/450/250"/>
149+
<img pfe-overflow="right left" src="https://placekitten.com/450/250"/>
150150
<pfe-cta slot="pfe-card--footer">
151151
<a href="#">Learn more</a>
152152
</pfe-cta>
@@ -155,7 +155,7 @@ <h2>Imaged card with side overflow</h2>
155155
<pfe-card pfe-color="lighter">
156156
<h2>Imaged card with side & bottom overflow</h2>
157157
<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Soluta rerum tempore natus alias! Cumque illum provident corrupti voluptates.</p>
158-
<img pfe-overflow="right left bottom" src="http://placekitten.com/400/250" slot="pfe-card--footer"/>
158+
<img pfe-overflow="right left bottom" src="https://placekitten.com/400/250" slot="pfe-card--footer"/>
159159
</pfe-card>
160160
</div>
161161
</body>

elements/pfe-card/demo/pfe-card.story.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ stories.add(PfeCard.tag, () => {
8888
break;
8989
}
9090

91-
image = `<img src=\"http://placekitten.com/1000/300\" ${overflowAttr.length > 0 ? ` pfe-overflow=\"${overflowAttr.join(" ")}\"` : ""}/>`;
91+
image = `<img src=\"https://placekitten.com/1000/300\" ${overflowAttr.length > 0 ? ` pfe-overflow=\"${overflowAttr.join(" ")}\"` : ""}/>`;
9292
if(region === "footer") {
9393
slots.footer.default = image;
9494
} else {

elements/pfe-card/test/pfe-card_test.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ <h2 slot="pfe-card--header">Card 1</h2>
2727
</pfe-card>
2828

2929
<pfe-card id="card2">
30-
<img src="http://placekitten.com/200/150"/>
30+
<img src="https://placekitten.com/200/150"/>
3131
</pfe-card>
3232

3333
<pfe-card id="card3">
3434
<h2 slot="pfe-card--header">Card 3</h2>
35-
<img src="http://placekitten.com/1000/500" pfe-overflow="top right bottom left"/>
35+
<img src="https://placekitten.com/1000/500" pfe-overflow="top right bottom left"/>
3636
</pfe-card>
3737

3838
<pfe-card id="card4">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<title>PatternFly Element | pfe-content-set Demo</title>
6-
<link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css" />
6+
<link rel="stylesheet" href="https://overpass-30e2.kxcdn.com/overpass.css" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
88
<!-- uncomment the es5-adapter if you're using the umd version -->
9-
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.7/custom-elements-es5-adapter.js"></script>
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.7/webcomponents-bundle.js"></script>
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
10+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-bundle.js"></script>
1111
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
1212
<script>
1313
require([
@@ -287,4 +287,4 @@ <h2>Heading 2</h2>
287287
<div>Nullam quis risus eget urna mollis ornare vel eu leo. Maecenas sed diam eget risus varius blandit sit amet non magna. Cras justo odio, dapibus ac facilisis in, egestas eget quam.</div>
288288
</pfe-content-set>
289289
</body>
290-
</html>
290+
</html>

elements/pfe-cta/demo/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">
1010
</noscript-->
1111
<link href="../../pfe-cta/pfe-cta--lightdom.css" rel="stylesheet">
12-
<link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css" />
12+
<link rel="stylesheet" href="https://overpass-30e2.kxcdn.com/overpass.css" />
1313
<link href="../../pfelement/pfelement.min.css" rel="stylesheet">
1414
<link href="demo.css" rel="stylesheet">
1515
<!-- uncomment the es5-adapter if you're using the umd version -->
16-
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/custom-elements-es5-adapter.js"></script>
1717
<!-- Use webcomponents-loader when you are adding support for more modern browsers -->
18-
<!-- <script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
18+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.2.10/webcomponents-loader.js"></script> -->
1919
<!-- IE11 test: use bundle + require with umd files -->
2020
<!-- Use webcomponents-bundle when supporting much older browsers like IE11 -->
2121
<script src="/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>

0 commit comments

Comments
 (0)