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.

Sign up for GitHub

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

Accessibility: Unable to navigate to close 'X' icon with keyboard #5964

Merged
merged 2 commits into from
Aug 14, 2019
Merged

Accessibility: Unable to navigate to close 'X' icon with keyboard #5964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d770efc
Change the <a> to a <button> and add some internal styling to ensure …
BatJan Jul 20, 2019
accc927
Add sr-only text "Close" for the X button
BatJan Jul 20, 2019
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
22 changes: 12 additions & 10 deletions src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,34 @@
<div class="umb-tour__pulse"></div>

<div class="umb-tour__popover shadow-depth-2" ng-class="{'umb-tour__popover--l': model.currentStep.type === 'intro' || model.currentStepIndex === model.steps.length}">

<div ng-if="!configuredView && !elementNotFound">

<!-- Regular steps -->
<umb-tour-step ng-if="model.currentStepIndex < model.steps.length" on-close="model.endTour()">

<umb-tour-step-header
title="model.currentStep.title">
</umb-tour-step-header>

<umb-tour-step-content
content="model.currentStep.content">
</umb-tour-step-content>

<umb-tour-step-footer>

<div class="flex justify-between items-center">

<div>
<umb-tour-step-counter
current-step="model.currentStepIndex + 1"
total-steps="model.steps.length">
</umb-tour-step-counter>
<div ng-if="model.allowDisable && model.currentStep.type === 'intro'" style="font-size: 13px;"><a href="" class="underline" ng-click="model.disableTour()">Don't show this tour again</a></div>
<div ng-if="model.allowDisable && model.currentStep.type === 'intro'">
<button type="button" class="underline" ng-click="model.disableTour()" style="font-size: 13px; background: transparent; border: none; padding: 0;" prevent-default>Don't show this tour again</button>
</div>
</div>

<div ng-if="model.currentStep.type !== 'intro'">
<umb-button size="xs" ng-if="!model.currentStep.event" button-style="action" type="button" action="model.nextStep()" label="Next"></umb-button>
</div>
Expand All @@ -40,7 +42,7 @@
</div>

</umb-tour-step-footer>

</umb-tour-step>

<!-- Outro step -->
Expand All @@ -64,7 +66,7 @@ <h3 class="bold">Congratulations!</h3>

<!-- Custom step view -->
<div ng-if="configuredView && !loadingStep && !elementNotFound" ng-include="configuredView"></div>

<!-- Dom element not found error -->
<div ng-if="elementNotFound && !loadingStep">
<umb-tour-step class="tc">
Expand All @@ -83,4 +85,4 @@ <h4 class="bold color-red">Oh, we got lost!</h4>

</div>

</div>
</div>
8 changes: 6 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@


<div ng-if="hideClose !== true">
<button class="icon-wrong umb-tour-step__close" ng-click="close()"></button>
<button class="icon-wrong umb-tour-step__close" ng-click="close()">
<span class="sr-only">
<localize key="general_close">Close</localize>
</span>
</button>
</div>

<div ng-transclude></div>

</div>
</div>