Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d1bc92e
Fixing issue #478 regarding CTA alignment in footer. Also fixing img …
markcaron Sep 30, 2019
11cc86c
Fixing Edge issues with the slot wrapper
markcaron Oct 1, 2019
a3525f5
Updating test for footer. Removing class expectation on footer slot.
markcaron Oct 2, 2019
95c1180
[dev]: Suggested additions for the card cta alignment branch
Oct 3, 2019
216d860
[dev]: Add specificity to overflow selectors
Oct 3, 2019
bbc4a2e
[dev]: Push up test fixes
Oct 3, 2019
756b705
Merge pull request #561 from patternfly/pfe-card-cta-alignment-fork
markcaron Oct 4, 2019
0c78a71
Merge branch 'master' of github.com:patternfly/patternfly-elements in…
Oct 4, 2019
65e1512
[dev]: Adjusting styles
Oct 7, 2019
f6d5bbe
Merge branch 'master' into pfe-card-cta-alignment
starryeyez024 Oct 11, 2019
25c6fff
[dev]: Updates supporting Edge and IE11
Oct 11, 2019
bd05e84
[dev]: Add optional light dom styles for IE11 images
Oct 11, 2019
2da48bb
Merge branch 'master' into pfe-card-cta-alignment
starryeyez024 Oct 16, 2019
9865c9d
Fixing Selenium test failures. Removing image disortion tweaks just f…
markcaron Oct 17, 2019
bd2c65e
Updating package-lock to fix conflict
markcaron Oct 17, 2019
69f2915
Merge branch 'master' into pfe-card-cta-alignment
markcaron Oct 17, 2019
9ed21e7
Merge branch 'master' into pfe-card-cta-alignment
starryeyez024 Oct 21, 2019
2f016f3
Merge branch 'master' into pfe-card-cta-alignment
kylebuch8 Oct 24, 2019
91405f9
Merge branch 'master' into pfe-card-cta-alignment
starryeyez024 Oct 24, 2019
48c8ae5
Merge branch 'master' of github.com:patternfly/patternfly-elements in…
Oct 24, 2019
ccf4000
Merge branch 'pfe-card-cta-alignment' of github.com:patternfly/patter…
Oct 24, 2019
fc24bf7
fix: apply updates to pfe-card for efficient sass
Oct 24, 2019
74f3396
[dev]: Fix comment style in mixins; update package to include --light…
Oct 24, 2019
a4b2288
[dev]: Update changelog
Oct 24, 2019
2bd14bc
[dev]: Add contributors to package :D
Oct 24, 2019
99c7fbc
Merge branch 'master' into pfe-card-cta-alignment
castastrophe Oct 24, 2019
223a564
Merge branch 'master' into pfe-card-cta-alignment
starryeyez024 Oct 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG-prerelease.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Tag: [v1.0.0-prerelease.28](https://github.com/patternfly/patternfly-elements/re

- []() fix: adding a mutation observer to pfe-content-set so it works in Angular
- []() feat: adding a schema to pfe-icon-panel #572
- []() fix: pfe-card cta alignment #560

## Prerelease 27 ( 2019-10-25 )

Expand All @@ -29,6 +30,7 @@ Tag: [v1.0.0-prerelease.27](https://github.com/patternfly/patternfly-elements/re
- [1f9ec10](https://github.com/patternfly/patternfly-elements/commit/1f9ec10488a4a879d230705c2ea3d783d2df45f6) feat: pfe-cta add wind variant styles
- [a162a43](https://github.com/patternfly/patternfly-elements/commit/a162a431923d037bf33a8ba0ef77edd9d059a39c) fix: bug in pfe-tab-panel


## Prerelease 25 ( 2019-09-10 )

Tag: [v1.0.0-prerelease.25](https://github.com/patternfly/patternfly-elements/releases/tag/v1.0.0-prerelease.25)
Expand Down
33 changes: 26 additions & 7 deletions elements/pfe-card/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
</noscript>

<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet">
<link href="../dist/pfe-card--lightdom.css" rel="stylesheet">

<style>
/* For demo only */
Expand All @@ -38,6 +39,13 @@
min-width: 200px;
width: calc(25% - 32px);
}
.button-series {
display: inline-block;
}
.button-series > *:not(first-child) {
display: inline-block;
margin-left: 15px;
}

h2[slot="pfe-card--header"] {
font-size: 1.1em;
Expand All @@ -53,6 +61,10 @@
--pfe-card__header--BackgroundColor: #0477a4;
--pfe-card__header--Color: #fff;
}

a {
color: var(--pfe-broadcasted--color--ui-link);
}
</style>

</head>
Expand All @@ -63,19 +75,26 @@ <h1>&lt;pfe-card&gt;</h1>
<pfe-card pfe-color="lightest" class="custom-border">
<h2 slot="pfe-card--header">Lightest card</h2>
<p>This is the lightest pfe-card and <a href="#">a link</a>.</p>
<pfe-cta slot="pfe-card--footer">
<a href="#">Learn more</a>
</pfe-cta>
<div class="button-series" slot="pfe-card--footer">
<pfe-cta slot="pfe-card--footer" pfe-priority="secondary">
<a href="#">Try</a>
</pfe-cta>
<pfe-cta pfe-priority="primary">
<a href="#">Buy</a>
</pfe-cta>
</div>
</pfe-card>

<pfe-card pfe-color="lighter">
<h2 slot="pfe-card--header">Light card</h2>
<p>This is the light pfe-card and <a href="#">a link</a>.</p>
<p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>
<p>Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
<pfe-cta slot="pfe-card--footer">
<a href="#">Learn more</a>
</pfe-cta>
<div slot="pfe-card--footer">
<pfe-cta pfe-priority="primary">
<a href="#">Buy</a>
</pfe-cta>
</div>
</pfe-card>

<pfe-card>
Expand Down Expand Up @@ -138,7 +157,7 @@ <h2>Imaged card with top & side overflow</h2>
<pfe-card pfe-color="lighter" class="custom-header-background">
<h2 slot="pfe-card--header">Imaged card with side overflow + header</h2>
<img pfe-overflow="top right left" src="https://placekitten.com/500/250"/>
<p style="margin-top: 10px;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Quaerat porro similique saepe tempora vel! Facilis, porro?</p>
<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quaerat porro similique saepe tempora vel! Facilis, porro?</p>
<pfe-cta slot="pfe-card--footer">
<a href="#">Learn more</a>
</pfe-cta>
Expand Down
13 changes: 13 additions & 0 deletions elements/pfe-card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
"directory": "elements/pfe-card"
},
"main": "./dist/pfe-card.js",
"files": [
"pfe-card.*js",
"pfe-card.*js.map",
"pfe-card--lightdom.*css",
"pfe-card--lightdom.*css.map"
],
"scripts": {
"build": "../../node_modules/.bin/gulp && ../../node_modules/.bin/prettier --ignore-path ../../.prettierignore --write '**/*.{js,json}'",
"dev": "../../node_modules/.bin/gulp dev",
Expand All @@ -29,6 +35,13 @@
"name": "Mark Caron",
"email": "mark@redhat.com",
"url": "https://github.com/markcaron"
},
{
"name": "Kendall Totten"
},
{
"name": "castastrophe",
"url": "https://www.github.com/castastrophe"
}
],
"license": "MIT",
Expand Down
8 changes: 8 additions & 0 deletions elements/pfe-card/src/pfe-card--lightdom.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import "../../pfe-sass/pfe-sass";
$LOCAL: card;

@include browser-query(ie11) {
pfe-card img[pfe-overflow] {
max-width: 100%;
}
}
12 changes: 9 additions & 3 deletions elements/pfe-card/src/pfe-card.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<!-- pfe-card -->
<slot class="pfe-card__header" name="pfe-card--header"></slot>
<slot class="pfe-card__body"></slot>
<slot class="pfe-card__footer" name="pfe-card--footer"></slot>
${ this.has_slot("pfe-card--header") ? `<div class="pfe-card__header">
<slot name="pfe-card--header"></slot>
</div>` : ``}
<div class="pfe-card__body">
<slot></slot>
</div>
${ this.has_slot("pfe-card--footer") ? `<div class="pfe-card__footer">
<slot name="pfe-card--footer"></slot>
</div>` : ``}
Loading