Skip to content

Commit

Permalink
fix: button and accordion controls not inheriting font-family styles …
Browse files Browse the repository at this point in the history
…and update fast packages (microsoft#14828)

* update fast packages and add inherit to controls for button and accordion item

* Change files

* add yarn lock

Co-authored-by: Seth Donohue <sethdonohue@Admins-MBP.guest.corp.microsoft.com>
  • Loading branch information
2 people authored and hutchcodes committed Sep 10, 2020
1 parent d641ac0 commit 7b4b64d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "update fast packages and add font-family inherit to controls of button and accordion-item",
"packageName": "@fluentui/web-components",
"email": "sethdonohue@Admins-MBP.guest.corp.microsoft.com",
"dependentChangeType": "patch",
"date": "2020-08-31T19:53:27.723Z"
}
2 changes: 1 addition & 1 deletion packages/web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"dependencies": {
"@microsoft/fast-colors": "^5.1.0",
"@microsoft/fast-components-styles-msft": "^4.29.0",
"@microsoft/fast-element": "^0.16.0",
"@microsoft/fast-element": "^0.17.0",
"@microsoft/fast-foundation": "^1.7.0",
"tslib": "^1.13.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const AccordionItemStyles = css`
line-height: var(--type-ramp-minus-1-line-height);
border-bottom: calc(var(--outline-width) * 1px) solid ${neutralDividerRestBehavior.var};
}
.region {
display: none;
padding: calc((6 + (var(--design-unit) * 2 * var(--density))) * 1px);
Expand All @@ -45,6 +45,7 @@ export const AccordionItemStyles = css`
height: calc(${heightNumber} * 1px);
color: ${neutralForegroundRestBehavior.var};
cursor: pointer;
font-family: inherit;
}
.button:hover {
Expand Down Expand Up @@ -97,7 +98,7 @@ export const AccordionItemStyles = css`
slot[name="expanded-icon"] {
display: none;
}
:host(.expanded) slot[name="expanded-icon"] {
display: flex;
}
Expand Down
1 change: 1 addition & 0 deletions packages/web-components/src/styles/patterns/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export const BaseButtonStyles: ElementStyles = css`
border-radius: inherit;
fill: inherit;
cursor: inherit;
font-family: inherit;
}
:host(:hover) {
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2395,17 +2395,17 @@
"@microsoft/fast-jss-utilities" "^4.8.0"
"@microsoft/fast-web-utilities" "^4.6.0"

"@microsoft/fast-element@^0.16.0":
version "0.16.0"
resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-0.16.0.tgz#0c60394d54f37478a359d9965d6c102c1e09bbf1"
integrity sha512-cW8Vj1+VpwRPoC7wK0gG7GCt5W4ZcluUPJZfcOHA7ViVPMaW50Fkfv+jrunJLXCw1FuXE5caIUh2h/8aorYgRA==
"@microsoft/fast-element@^0.17.0":
version "0.17.0"
resolved "https://registry.yarnpkg.com/@microsoft/fast-element/-/fast-element-0.17.0.tgz#2d52b6c83375fbf2c6d05bc45211dad3960dff1a"
integrity sha512-bPkPPYcZ+hojPQ3m1WPdI5Z3d+fJbpddCdSspZy6T6NV9JoIDRg+gaJcBWWQmeBDsCsG+dVNK1RezXuWLP5qpA==

"@microsoft/fast-foundation@^1.7.0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-1.7.0.tgz#084102ca3ee3ded043db1fccd6e98edebe4b1981"
integrity sha512-hJmzCdsX6s+BT/HRj5OhUMSUGZ27WCbCE7sXVE+0BU7NeQPYY1w6sG0sJz9fu8UBLsuesU7aWpVCEpVu277K6g==
version "1.7.1"
resolved "https://registry.yarnpkg.com/@microsoft/fast-foundation/-/fast-foundation-1.7.1.tgz#17fede34bf76bd0195b5c5b76a73ce765d69edd1"
integrity sha512-8eTpcBRz6aLiVP6/FMUEiFw/t3DxA6xnT/8UkFI8NJQtBlZdIatt5+2PSwj5IsS4sqkniCeIv+wWa5jX6FHrSQ==
dependencies:
"@microsoft/fast-element" "^0.16.0"
"@microsoft/fast-element" "^0.17.0"
"@microsoft/fast-web-utilities" "^4.6.0"
"@microsoft/tsdoc-config" "^0.13.4"
tabbable "^4.0.0"
Expand Down

0 comments on commit 7b4b64d

Please sign in to comment.