Skip to content
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.

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

V9 merge 05212018 #801

Merged
merged 14 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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