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

US136099 - sub old d2l-offscreen with core version #131

Merged
merged 3 commits into from
Feb 10, 2022
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
14 changes: 3 additions & 11 deletions d2l-navigation-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'd2l-button/d2l-button-behavior.js';
import 'd2l-polymer-behaviors/d2l-focusable-behavior.js';
import 'd2l-polymer-behaviors/d2l-id.js';
import { highlightStyles } from './d2l-navigation-highlight-styles.js';
import 'd2l-offscreen/d2l-offscreen-shared-styles.js';
import '@brightspace-ui/core/components/offscreen/offscreen.js';

import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
Expand Down Expand Up @@ -36,7 +36,7 @@ class D2LNavigationButton extends mixinBehaviors([D2L.PolymerBehaviors.Button.Be
static get template() {
const template = html`
${highlightStyles}
<style is="custom-style" include="d2l-offscreen-shared-styles">
<style is="custom-style">

:host {
display: inline-block;
Expand Down Expand Up @@ -82,14 +82,6 @@ class D2LNavigationButton extends mixinBehaviors([D2L.PolymerBehaviors.Button.Be
@apply --d2l-navigation-highlight-border;
}

.d2l-offscreen-description {
@apply --d2l-offscreen;
}

:host(:dir(rtl)) .d2l-offscreen-description {
@apply --d2l-offscreen-rtl;
}

:host([disabled]) button {
@apply --d2l-navigation-highlight-disabled;
}
Expand All @@ -115,7 +107,7 @@ class D2LNavigationButton extends mixinBehaviors([D2L.PolymerBehaviors.Button.Be
<span class$="[[_getTopBorderClass()]]"></span>
<slot></slot>
</button>
<span id="[[_ariaDescriptionId]]" class="d2l-offscreen-description">[[ariaDescribedbyText]]</span>
<d2l-offscreen id="[[_ariaDescriptionId]]">[[ariaDescribedbyText]]</d2l-offscreen>
`;
template.setAttribute('strip-whitespace', '');
return template;
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"d2l-button": "github:BrightspaceUI/button#semver:^5",
"d2l-link": "github:BrightspaceUI/link#semver:^5",
"d2l-localize-behavior": "github:BrightspaceUI/localize-behavior#semver:^2",
"d2l-offscreen": "github:BrightspaceUI/offscreen#semver:^4",
"d2l-polymer-behaviors": "github:Brightspace/d2l-polymer-behaviors-ui#semver:^2",
"d2l-typography": "github:BrightspaceUI/typography#semver:^7",
"fastdom": "^1",
Expand Down