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

Fix accessibility issues with saved object finder #13152

Merged
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
36 changes: 18 additions & 18 deletions src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
>
<div class="kuiLocalDropdownTitle">Add Panels</div>

<ul class="nav nav-tabs">
<li ng-class="{active: mode == 'visualization'}">
<a
ng-click="mode='visualization'"
aria-label="List visualizations"
>
Visualization
</a>
</li>
<li ng-class="{active: mode == 'search'}">
<a
ng-click="mode='search'"
aria-label="List saved searches"
>
Saved Search
</a>
</li>
</ul>
<div class="kuiTabs">
<button
ng-class="{ 'kuiTab-isSelected': mode == 'visualization'}"
class="kuiTab"
ng-click="mode='visualization'"
aria-label="List visualizations"
>
Visualization
</button>
<button
ng-class="{ 'kuiTab-isSelected': mode == 'search' }"
class="kuiTab"
ng-click="mode='search'"
aria-label="List saved searches"
>
Saved Search
</button>
</div>

<div class="list-group-item list-group-item--noBorder" ng-switch-when="visualization">
<saved-object-finder
Expand Down
10 changes: 0 additions & 10 deletions src/ui/public/directives/saved_object_finder.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
//key handler for the filter text box
self.filterKeyDown = function ($event) {
switch (keyMap[$event.keyCode]) {
case 'tab':
if (self.hitCount === 0) return;

self.selector.index = 0;
self.selector.enabled = true;

selectTopHit();

$event.preventDefault();
break;
case 'enter':
if (self.hitCount !== 1) return;

Expand Down
14 changes: 13 additions & 1 deletion src/ui/public/styles/dark-theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,16 @@
// /src/ui/public/styles/bootstrap/list-group.less
.list-group-item {
background-color: @list-group-bg;
border: 0 none transparent;
border: 1px solid @gray7;
&:nth-child(even) {
background-color: @gray4;
}
}

.list-group-item--noBorder {
border-top: 0;
}

a.list-group-item,
button.list-group-item {
color: @list-group-link-color;
Expand Down Expand Up @@ -224,6 +228,14 @@
}
}

saved-object-finder, paginated-selectable-list {
ul.li-striped {
li {
border: none;
}
}
}

.cell-hover {
background-color: @table-cell-hover-bg;

Expand Down
6 changes: 6 additions & 0 deletions ui_framework/components/tabs/_index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
$tabBackgroundColor: #FFF;
$tabHoverBackgroundColor: #F2F2F2;

// Dark theme colors
$tabColor--darkTheme: $globalTextColor--darkTheme;
$tabBackgroundColor--darkTheme: #333333;
$tabHoverBackgroundColor--darkTheme: $globalBackgroundColor--darkTheme;
$tabBorderColor--darkTheme: $globalBackgroundColor--darkTheme;

@import "tabs";
28 changes: 27 additions & 1 deletion ui_framework/components/tabs/_tabs.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.kuiTabs {
display: flex;
border-bottom: $globalBorderThin;

@include darkTheme {
border-bottom: 1px solid $tabBorderColor--darkTheme;
}
}


Expand All @@ -19,10 +23,15 @@
color: $globalSubduedTextColor;
background-color: $tabBackgroundColor; /* 1 */
border: 1px solid $globalBorderColor;
border-bottom-width: 1px;
border-radius: 0; /* 1 */
margin-bottom: -1px; /* 3 */

@include darkTheme {
color: $tabColor--darkTheme;
background-color: $tabBackgroundColor--darkTheme;
border-color: $tabBorderColor--darkTheme;
}

& + & {
border-left: none;

Expand All @@ -44,16 +53,33 @@
z-index: 1;
color: $globalLinkColor;
border: 1px solid $globalSelectedBorderColor !important;

@include darkTheme {
color: $tabColor--darkTheme;
background-color: $tabBackgroundColor--darkTheme;
border-color: $tabBorderColor--darkTheme !important;
}
}

&:hover:not(.kuiTab-isSelected) {
color: $globalLinkHoverColor;
background-color: $tabHoverBackgroundColor;

@include darkTheme {
color: $globalLinkColor-isHover--darkTheme;
background-color: $tabHoverBackgroundColor--darkTheme;
}
}

&.kuiTab-isSelected {
cursor: default;
color: $globalFontColor;
border-bottom-color: $tabBackgroundColor;

@include darkTheme {
color: $tabColor--darkTheme;
background-color: $tabBackgroundColor--darkTheme;
border-bottom-color: $tabBackgroundColor--darkTheme;
}
}
}
18 changes: 17 additions & 1 deletion ui_framework/dist/ui_framework.css
Original file line number Diff line number Diff line change
Expand Up @@ -2921,6 +2921,8 @@ main {
display: -ms-flexbox;
display: flex;
border-bottom: 1px solid #D9D9D9; }
.theme-dark .kuiTabs {
border-bottom: 1px solid #777777; }

/**
* 1. Override button styles (some of which are from Bootstrap).
Expand All @@ -2941,11 +2943,14 @@ main {
background-color: #FFF;
/* 1 */
border: 1px solid #D9D9D9;
border-bottom-width: 1px;
border-radius: 0;
/* 1 */
margin-bottom: -1px;
/* 3 */ }
.theme-dark .kuiTab {
color: #cecece;
background-color: #333333;
border-color: #777777; }
.kuiTab + .kuiTab {
border-left: none; }
.kuiTab + .kuiTab:focus:not(.kuiTab-isSelected):not(:active) {
Expand All @@ -2963,13 +2968,24 @@ main {
z-index: 1;
color: #0079a5;
border: 1px solid #0079a5 !important; }
.theme-dark .kuiTab:focus:not(.kuiTab-isSelected):not(:active) {
color: #cecece;
background-color: #333333;
border-color: #777777 !important; }
.kuiTab:hover:not(.kuiTab-isSelected) {
color: #006E8A;
background-color: #F2F2F2; }
.theme-dark .kuiTab:hover:not(.kuiTab-isSelected) {
color: #def2f6;
background-color: #777777; }
.kuiTab.kuiTab-isSelected {
cursor: default;
color: #191E23;
border-bottom-color: #FFF; }
.theme-dark .kuiTab.kuiTab-isSelected {
color: #cecece;
background-color: #333333;
border-bottom-color: #333333; }

/**
* 1. Allow container to deteermine font-size and line-height.
Expand Down
2 changes: 1 addition & 1 deletion ui_framework/doc_site/src/views/tabs/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class KuiTabsExample extends React.Component {
this.setState({
selectedTabId: id,
});
}
};

renderTabs() {
return this.tabs.map((tab,index) => (
Expand Down
7 changes: 7 additions & 0 deletions ui_framework/doc_site/src/views/tabs/tabs_example.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ export default props => (
<GuideDemo>
<Tabs />
</GuideDemo>

<GuideText>
Dark themed tabs
</GuideText>
<GuideDemo isDarkTheme={true}>
<Tabs />
</GuideDemo>
</GuideSection>

</GuidePage>
Expand Down