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

Jump to bottom

Replace role=main by main elements #12671

Merged
merged 4 commits into from
Jul 12, 2017
Merged

Replace role=main by main elements #12671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65e1839
Replace role=main by main elements
timroes Jul 5, 2017
80f078d
Move main style to _common_styles
Jul 6, 2017
0c80702
Add compiled UI Framework CSS.
cjcenizal Jul 11, 2017
7378fb5
Merge pull request #1 from cjcenizal/12671/compiled-css
timroes Jul 11, 2017
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
5 changes: 2 additions & 3 deletions src/core_plugins/kibana/public/context/app.html
View file
Open in desktop
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 @@ -156,4 +155,4 @@
<div class="kuiBarSection">
</div>
</div>
</div>
</main>
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html
View file
Open in desktop
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
View file
Open in desktop
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 @@ -168,5 +168,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,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
View file
Open in desktop
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 */
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh actually, now that this is part of the UI Framework, we need to recompile and commit the CSS. Just run npm run uiFramework:start to kick off compilation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure, this is still needed? Running the task (or also uiFramework:build doesn't change any files managed by git. Do I need to copy the compiled files somewhere?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I think I should probably rename that task. npm run uiFramework:start will recompile the compiled CSS, whereas uiFramework:build will only build the documentation site.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjcenizal I ran both of the tasks, none of them touches git managed files for me?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created timroes#1 for now. We can walk through the task when you're done with X-School to figure out what's going on. 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged, and we figure out next week what's wrong with my buildsystem :D

7 changes: 7 additions & 0 deletions ui_framework/dist/ui_framework.css
View file
Open in desktop
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