Skip to content

Commit

Permalink
removed kebab variation from the dropdown pattern, removed kebab patt…
Browse files Browse the repository at this point in the history
…ern and multiselection from card pattern, and included utility classes to add margin-bottom to the icons in the card
  • Loading branch information
jgiardino committed Nov 7, 2016
1 parent 5ac9511 commit 166c90f
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 61 deletions.
10 changes: 3 additions & 7 deletions source/_patterns/basics/dropdowns/00-dropdown.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<div class="dropdown {{ dropdownState }} {{#if isKebab}}pf-dropdown__kebab{{/if}} {{#if pullright}}pull-right{{/if}}" aria-labelledby="{{ dropdownAriaLabelledby }}">
<button type="button" class="btn {{#if isKebab}}btn-link{{else}}{{ btnClass }}{{/if}} dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{#if isKebab}}
<span class="fa fa-ellipsis-v"></span>
{{else}}
{{ dropdownText }}
{{/if}}
<div class="dropdown {{ dropdownState }} {{#if pullright}}pull-right{{/if}}" aria-labelledby="{{ dropdownAriaLabelledby }}">
<button type="button" class="btn {{ btnClass }} dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ dropdownText }}
</button>
<div class="dropdown-menu {{#if pullright}}dropdown-menu-right{{/if}}">
{{#each dropdownList}}
Expand Down
1 change: 0 additions & 1 deletion source/_patterns/basics/dropdowns/02-dropdown-styles.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
{{> basics-dropdown dropdownText= "Info" btnClass="btn-info" }}
{{> basics-dropdown dropdownText= "Warning" btnClass="btn-warning" }}
{{> basics-dropdown dropdownText= "Danger" btnClass="btn-danger" }}
{{> basics-dropdown isKebab= true }}
3 changes: 0 additions & 3 deletions source/_patterns/basics/dropdowns/03-dropdown-kebab.hbs

This file was deleted.

Empty file.
26 changes: 5 additions & 21 deletions source/_patterns/components/03-cards/00-card.hbs
Original file line number Diff line number Diff line change
@@ -1,36 +1,20 @@

<div class="card {{#if textCenter}}text-xs-center{{/if}} {{#if cardAccent}}pf-card--accented{{/if}} {{#if multiselect}}pf-card--multiselect{{/if}}">
<div class="card pf-card {{#if textCenter}}text-xs-center{{/if}} {{#if cardAccent}}pf-card--accented{{/if}}">
{{#if cardHeader}}
<div class="card-header {{#if multiselect}}pf-card--multiselect__header{{/if}}">
{{#if multiselect}}
<div class="pf-card__checkbox">
<input type="checkbox">
</div>
{{/if}}
{{#if cardKebab}}
{{> basics-dropdown isKebab=true pullright=true }}
{{/if}}
<div class="card-header">
{{#if cardHeaderDropdown}}
{{> basics-dropdown dropdownText="Dropdown" pullright=true }}
{{/if}}
<{{cardTitleSize}} class="card-title">{{{cardTitle}}}</{{cardTitleSize}}>
</div>
<div class="card-block">
{{else}}
<div class="card-block {{#if multiselect}}pf-card--multiselect__block{{/if}}">
{{#if multiselect}}
<div class="pf-card__checkbox">
<input type="checkbox">
</div>
{{/if}}
<div class="card-block">
{{#if cardTitleIconLarge}}
{{> basics-icon iconFamily="pficon" iconName="pficon-middleware" iconModifier="pf-icon--circle pf-icon--lg" }}
{{> basics-icon iconFamily="pficon" iconName="pficon-middleware" iconModifier="pf-icon--circle pf-icon--lg mb-pf-lg" }}
{{/if}}
{{#if cardTitleIconMedium}}
{{> basics-icon iconFamily="pficon" iconName="pficon-middleware" iconModifier="pf-icon--circle pf-icon--md" }}
{{/if}}
{{#if cardKebab}}
{{> basics-dropdown isKebab=true pullright=true }}
{{> basics-icon iconFamily="pficon" iconName="pficon-middleware" iconModifier="pf-icon--circle pf-icon--md mb-pf-md" }}
{{/if}}
<{{cardTitleSize}} class="card-title">{{{cardTitle}}}</{{cardTitleSize}}>
{{/if}}
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion source/_patterns/components/03-cards/01-card-kebab.hbs

This file was deleted.

This file was deleted.

This file was deleted.

27 changes: 2 additions & 25 deletions source/scss/_pf-component-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Base styles
//

.card {
.pf-card {
@include box-shadow($pf-box-shadow);
}

Expand All @@ -11,7 +11,7 @@
// bootstrap defaults.
//

.card{
.pf-card {
border: none;

.card-header{
Expand All @@ -27,26 +27,3 @@
.pf-card--accented {
border-top: 2px solid $color-pf-blue-300;
}
.pf-card--multiselect__block,
.pf-card--multiselect__header {
padding-left: $pf-spacer-xxl;
padding-right: $pf-spacer-xxl;
}
.pf-card__checkbox {
position: absolute;
top: $pf-spacer-xxxs;
left: $pf-spacer-xxs;
input[type=checkbox] {
//visibility: hidden; is not keyboard accessible and should be replaced with something that keeps the checkbox "visible" in the dom but not rendered on the screen
// using z-index to push the checkbox behind the card until it has keyboard focus, or the user hovers over the card
z-index:-1;
position: relative;
width: $pf-spacer-xxxl;
height: $pf-spacer-xxxl;
.pf-card--multiselect:hover &,
&:focus,
&:checked {
z-index:auto;
}
}
}

0 comments on commit 166c90f

Please sign in to comment.