Skip to content

Commit

Permalink
Replace role=main by main elements (#12671)
Browse files Browse the repository at this point in the history
* Replace role=main by main elements

* Move main style to _common_styles

* Add compiled UI Framework CSS.
  • Loading branch information
timroes authored Jul 12, 2017
1 parent dee4f7d commit 3fe58e9
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 7 deletions.
5 changes: 2 additions & 3 deletions src/core_plugins/kibana/public/context/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@
</div>
</div>

<div
<main
class="kuiViewContent kuiViewContentItem"
ng-if="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.FAILED"
role="main"
>
<!-- Controls -->
<div class="kuiBar kuiVerticalRhythm">
Expand Down Expand Up @@ -157,4 +156,4 @@
<div class="kuiBarSection">
</div>
</div>
</div>
</main>
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
</div>
</div>
</kbn-top-nav>
<div role="main" class="dev-tools__container" ng-transclude></div>
<main class="dev-tools__container" ng-transclude></main>
</div>
4 changes: 2 additions & 2 deletions src/core_plugins/kibana/public/discover/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h1 tabindex="0" id="kui_local_breadcrumb" class="kuiLocalBreadcrumb">
</div>
</kbn-top-nav>

<div class="container-fluid" role="main">
<main class="container-fluid">
<div class="row">
<filter-bar
state="state"
Expand Down Expand Up @@ -182,5 +182,5 @@ <h2>Searching</h2>
</div>
</div>
</div>
</div>
</main>
</discover-app>
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/management/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
</div>
</kbn-top-nav>

<div role="main" class="management-container" ng-transclude></div>
<main class="management-container" ng-transclude></main>
</div>
7 changes: 7 additions & 0 deletions ui_framework/components/_common_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@
body {
font-family: $globalFontFamily;
}

/**
* 1. Required for IE11.
*/
main {
display: block; /* 1 */
}
7 changes: 7 additions & 0 deletions ui_framework/dist/ui_framework.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@
body {
font-family: "Open Sans", Helvetica, Arial, sans-serif; }

/**
* 1. Required for IE11.
*/
main {
display: block;
/* 1 */ }

.kuiActionItem {
display: -webkit-box;
display: -webkit-flex;
Expand Down

0 comments on commit 3fe58e9

Please sign in to comment.