Skip to content

Commit 8fe82f1

Browse files
authored
Merge branch 'master' into spandx-port-fix
2 parents 653baa4 + df25d17 commit 8fe82f1

Some content is hidden

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

60 files changed

+13
-1391
lines changed

docs/assets/pfe-base-sass/variables/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ $pfe-global--disabled-state--BorderColor: $pfe-global--color--gray-mercur
160160
// Theme colors
161161
// ========================================================================
162162

163-
// I think these are misplaced. Should be in cp-theme instead.
163+
// @TODO I think these are misplaced. Should be in the theme instead
164164
// $pfe-global--primary-color: $pfe-global--color--red !default;
165165
// $pfe-global--secondary-color: $pf-color-black-600 !default;
166166
//

docs/assets/sass/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ $pfe-global--disabled-state--BorderColor: $pfe-global--color--gray-mercur
160160
// Theme colors
161161
// ========================================================================
162162

163-
// I think these are misplaced. Should be in cp-theme instead.
163+
// @TODO I think these are misplaced. Should be in the theme instead.
164164
// $pfe-global--primary-color: $pfe-global--color--red !default;
165165
// $pfe-global--secondary-color: $pf-color-black-600 !default;
166166
//

docs/content/develop/step-1a.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You may also specify multiple elements. For example, `pfe-card` and `pfe-cta` a
5555
npm run dev pfe-card pfe-cta
5656
```
5757

58-
## Preview Your Changes
58+
## Preview your changes
5959

6060
From the root of the PatternFly Elements repository, run the start command which will open a browser to the `/doc` directory.
6161

docs/content/theme/pfe-layouts.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ tags = [ "theme" ]
1212
<link rel="stylesheet" type="text/css" href="//overpass-30e2.kxcdn.com/overpass.css">
1313
<link rel="stylesheet" type="text/css" href="../pfe-layouts.css">
1414
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.14.0/themes/prism.min.css">
15-
<link rel="stylesheet" type="text/css" href="../../cp-themeset/cp-themeset.css">
1615

1716
<style>
1817

elements/pfe-accordion/demo/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>PFElements: pfe-accordion Demo</title>
66

77
<link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css" />
8-
<!-- <link rel="stylesheet" href="../../../themes/cp-theme/cp-theme.css" /> -->
98

109
<noscript>
1110
<link href="../../pfelement/pfelement-noscript.min.css" rel="stylesheet">

elements/pfe-autocomplete/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 Red Hat, Inc.
1+
Copyright 2019 Red Hat, Inc.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

elements/pfe-autocomplete/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44

55
## Install
66
```
7-
npm install @patternfly/cp-theme
87
npm install @patternfly/pfe-autocomplete
98
```
109

11-
cp-theme is a package that contains css variables setting that is used for theming patternfly elements.
1210

1311
Once installed, import it to your application:
1412
```
15-
import '@patternfly/cp-theme.umd.js';
1613
import '@patternfly/pfe-autocomplete.umd.js';
1714
```
1815

elements/pfe-autocomplete/demo/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<script src="/@webcomponents/webcomponentsjs/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([
18-
'../../../themes/cp-theme/cp-theme.umd.js',
1918
'../pfe-autocomplete.umd.js'
2019
])</script>
2120
</head>

elements/pfe-avatar/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 Red Hat, Inc.
1+
Copyright 2019 Red Hat, Inc.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

elements/pfe-avatar/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ PFElements Avatar Element
55
## Usage
66

77
```html
8-
<pfe-avatar name="Eleanore Stillwagon"></pfe-avatar>
8+
<pfe-avatar pfe-name="Eleanore Stillwagon"></pfe-avatar>
99

10-
<pfe-avatar name="Libbie Koscinski" shape="rounded" pattern="squares"></pfe-avatar>
10+
<pfe-avatar pfe-name="Libbie Koscinski" pfe-shape="rounded" pfe-pattern="squares"></pfe-avatar>
1111

12-
<pfe-avatar name="Blanca Rohloff" pattern="triangles"></pfe-avatar>
12+
<pfe-avatar pfe-name="Blanca Rohloff" pfe-pattern="triangles"></pfe-avatar>
1313

14-
<pfe-avatar name="Edwardo Lindsey" src="https://clayto.com/2014/03/rgb-webgl-color-cube/colorcube.jpg"></pfe-avatar>
14+
<pfe-avatar pfe-name="Edwardo Lindsey" pfe-src="https://clayto.com/2014/03/rgb-webgl-color-cube/colorcube.jpg"></pfe-avatar>
1515
```
1616

1717
## Attributes

0 commit comments

Comments
 (0)