Skip to content

Commit

Permalink
V9 merge 05212018 (#801)
Browse files Browse the repository at this point in the history
* feat(dropdown): added inline dropdown, style changes to dropdown, fixed link in data table readme  (#746)

* feat(dropdown): added inline dropdown

* feat(dropdown): fixed js

* feat(Skeleton-states): Add skeleton state styles (#713)

* feat(skeleton): Add skeleton loading mixin and styles

* feat(skeleton): Add skeleton icon styles

* feat(skeleton): Add skeleton styles to components

* feat(skeleton): Add structured list skeleton

* feat: skeleton styles

* feat: add skeleton demo html

* feat: update skeleton html

* feat(skeleton-states): Update accordion skeleton styles

* feat(skeleton-states): Update accordion

* chore: Update px to rem

* chore: remove duplicate code

* chore: Add correct color value for skeleton state

* feat(skeleton-states): Update data table

* fix(tile): add check to make sure element exists (#786)

* feat(data-table-v2): add inline edit styles for cell (#780)

* fix(table): Missing border in firefox (#787)

* fix(overflow-menu): added different styles for focus and hover (#788)

* fix(overflow-menu): added different styles for focus and hover

* fix(overflow-menu): fixed danger hover/focus

* fix(data-table-v2): remove left positioning from sort icon (#789)

* fix(tile): check if is--expanded is set when tile component is loaded (#791)

* fix(danger-button): Add correct hover color for icon (#794)

* fix(table): removes selected class from row on cancel click (#793)

* chore(git): update gitignore for *.log files (#798)

* fix(button): bring back primary danger button
  • Loading branch information
asudoh authored and alisonjoseph committed May 24, 2018
1 parent ae89e8e commit d0c839d
Show file tree
Hide file tree
Showing 17 changed files with 544 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dist
# OSX
.DS_Store

# Debug
npm-debug.log
# Logs
*.log

# Editors
project.sublime-project
Expand Down
5 changes: 5 additions & 0 deletions src/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@
color: $support-01;
border: $button-border-width solid $support-01;
}

&:hover > .#{$prefix}--btn__icon,
&:focus > .#{$prefix}--btn__icon {
fill: $inverse-01;
}
}

.#{$prefix}--btn--danger--primary {
Expand Down
24 changes: 24 additions & 0 deletions src/components/button/button.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ module.exports = {
notes: 'Danger buttons should be used for a negative action (such as Delete) on the page.',
context: {
variant: 'danger',
danger: true,
},
},
{
Expand All @@ -84,6 +85,29 @@ module.exports = {
`,
context: {
variant: 'danger',
danger: true,
small: true,
},
},
{
name: 'danger--primary',
label: 'Primary Danger Buttons',
context: {
variant: 'danger--primary',
danger: true,
},
},
{
name: 'danger--primary--small',
label: 'Primary Danger Buttons (Small)',
notes: `
Small buttons may be used when there is not enough space for a
regular sized button. This issue is most found in tables. Small button should have three words
or less.
`,
context: {
variant: 'danger--primary',
danger: true,
small: true,
},
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/button/button.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button">Button</button>
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button" disabled>Button</button>
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button">
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#if danger}}aria-label="danger"{{/if}} type="button">Button</button>
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#if danger}}aria-label="danger"{{/if}} type="button" disabled>Button</button>
<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#if danger}}aria-label="danger"{{/if}} type="button">
With icon
<svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
<path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
Expand Down
4 changes: 0 additions & 4 deletions src/components/data-table-v2/_data-table-v2-expandable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
display: none;
}

td {
background-color: $ui-01;
}

> td:first-of-type {
position: relative;

Expand Down
Loading

0 comments on commit d0c839d

Please sign in to comment.