Skip to content

Maintain circled pfe-icon height in flex display #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylebuch8 merged 7 commits into from
Oct 22, 2019
Merged

Maintain circled pfe-icon height in flex display #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5db221
Align items in the center and maintain their height
eyevana Oct 17, 2019
7045214
Switch to flex-start from center
eyevana Oct 17, 2019
85a7882
Update changelog
eyevana Oct 17, 2019
6c4c587
Merge branch 'master' into fix-icon-panel
kylebuch8 Oct 22, 2019
4f5cf22
fixing boolean logic in storybook utils
kylebuch8 Oct 22, 2019
e6fcd28
adding circled as a storybook option
kylebuch8 Oct 22, 2019
85f2096
making the pfe-icon show up square (ex. 64x64)
kylebuch8 Oct 22, 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
12 changes: 7 additions & 5 deletions .storybook/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ const listProperties = (obj) =>
let v = set[1];
let print = set[2];

// exit if the value is a boolean and is false
if (typeof v === "boolean" && !v) {
return;
}

// If no print value is provided, default to true
if (typeof print === "undefined") {
print = true;
Expand All @@ -44,11 +49,8 @@ const listProperties = (obj) =>
(v !== null && v !== "null")
) {
string += p;
// If the value is a boolean and is false, or the value is not a string true
if (
(typeof v === "string" && v !== "true") ||
(typeof v === "boolean" && !v)
) {
// If the value is a string and the value is not equal to the string "true"
if (typeof v === "string" && v !== "true") {
string += "=";
if (typeof v === "string") {
// If it's a string, use quotation marks around it
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG-prerelease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ Tag: [v1.0.0-prerelease.26](https://github.com/patternfly/patternfly-elements/re
- [27a97e1](https://github.com/patternfly/patternfly-elements/commit/27a97e135986de37ede55504a1630bf974de0e0c) pfe-cta: fix functions & IE11 accessibility
- [9a39ae3](https://github.com/patternfly/patternfly-elements/commit/9a39ae3b7d0b8d129a3aea3b58e71dab5013c721) fix: Adding object-fit to resolve image distortion in cards, #417
- [980203b](https://github.com/patternfly/patternfly-elements/commit/980203b2768d1d9d8813f386bb0f0bf37d3732ab) feat: Upgrade to latest version of storybook (#366)
- [ab5bc0e](https://github.com/patternfly/patternfly-elements/commit/ab5bc0e66b1e0f2f4ba180ff80d24b84d0db3260) feat: added sm md and xl sizes for pfe-progress-indicator (#575)
- [ab5bc0e](https://github.com/patternfly/patternfly-elements/commit/ab5bc0e66b1e0f2f4ba180ff80d24b84d0db3260) feat: added sm md and xl sizes for pfe-progress-indicator (#575)
- [fc51ba](https://github.com/patternfly/patternfly-elements/commit/fc51baf1cb4313ca117cc505ba9c0e99dd44d0e9) feat: Add pfe-number schema (#576)
- [](https://github.com/patternfly/patternfly-elements/commit/) fix: pfe-card: storybook issue with incorrect attribute (#573)
- []() Upgrade to latest version of storybook (#366)
- [](https://github.com/patternfly/patternfly-elements/commit/) pfe-datetime: adding a json schema
- [](https://github.com/patternfly/patternfly-elements/commit/) pfe-icon-panel: maintain icon height in flex display

## Prerelease 25 ( 2019-09-10 )

Expand Down
2 changes: 1 addition & 1 deletion elements/pfe-icon-panel/src/pfe-icon-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $pfe-icon-panel__icon-padding: .05em;
:host {
display: flex;
align-content: flex-start;
align-items: flex-start;
flex-direction: column;

@media (min-width: $pfe-global--grid-breakpoint--sm) {
Expand All @@ -29,7 +30,6 @@ $pfe-icon-panel__icon-padding: .05em;

margin-right: var(--pfe-icon--spacing);
font-size: var(--pfe-icon--size);
line-height: var(--pfe-icon--size);
padding: $pfe-icon-panel__icon-padding;
min-width: var(--pfe-icon--size);
max-width: var(--pfe-icon--size);
Expand Down
5 changes: 5 additions & 0 deletions elements/pfe-icon/src/pfe-icon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
],
"default": "default",
"prefixed": false
},
"circled": {
"title": "Circled",
"type": "boolean",
"prefixed": false
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions elements/pfe-icon/src/pfe-icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ $pfe-icon--border-style: #{pfe-var(ui--border-style)};

position: relative;
display: inline-block;
line-height: 0;

@at-root #{&}([data-block]) {
display: block;
Expand Down Expand Up @@ -59,12 +60,12 @@ $pfe-icon--border-style: #{pfe-var(ui--border-style)};
}

@supports (-ms-accelerator:true) {
/* IE Edge 12+ CSS */
/* IE Edge 12+ CSS */
@include greyscale-fallback();
}

@supports (-ms-ime-align:auto) {
/* IE Edge 16+ CSS */
/* IE Edge 16+ CSS */
@include greyscale-fallback();
}

Expand Down Expand Up @@ -139,11 +140,11 @@ $pfe-icon--border-style: #{pfe-var(ui--border-style)};
--pfe-icon--BackgroundColor: transparent;
--pfe-icon--BorderColor: transparent;
--pfe-icon--Padding: 0;

::slotted(*:first-child) {
margin-top: 0;
}

::slotted(*:last-child) {
margin-bottom: 0;
}
Expand Down