You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/18 08:54:22 UTC
[04/17] ignite git commit: IGNITE-5082 Fixed layout issues in IE11.
IGNITE-5082 Fixed layout issues in IE11.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/986532c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/986532c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/986532c4
Branch: refs/heads/ignite-5075
Commit: 986532c41fd737a93110e065717eb3f2e3ea37e9
Parents: 4e75e14
Author: Ilya Borisov <ib...@gridgain.com>
Authored: Thu May 18 11:19:13 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu May 18 11:19:13 2017 +0700
----------------------------------------------------------------------
.../frontend/app/components/web-console-header/style.scss | 5 ++---
.../web-console/frontend/public/stylesheets/style.scss | 10 ++++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/986532c4/modules/web-console/frontend/app/components/web-console-header/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/style.scss b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 78ff5f1..35f4d28 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -25,6 +25,7 @@ web-console-header {
font-size: 16px;
border-bottom: 4px solid red;
background: white;
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
.wch-slot {
&>* {
@@ -49,9 +50,7 @@ web-console-header {
flex-direction: row;
flex-wrap: wrap;
align-items: center;
- justify-content: center;
- min-height: 80px;
- padding: 10px 0;
+ padding: 18.5px 0;
}
.wch-logo {
http://git-wip-us.apache.org/repos/asf/ignite/blob/986532c4/modules/web-console/frontend/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index 7549549..4054fb1 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -328,16 +328,22 @@ h1, h2, h3, h4, h5, h6 {
height: #{"calc(100vh - 300px)"};
}
+body {
+ overflow-x: hidden;
+ display: flex;
+ flex-direction: column;
+}
+
body > .wrapper,
// Nested ui-view, like on password reset state
body > .wrapper > ui-view {
display: flex;
flex-direction: column;
min-height: 100%;
- flex: 1;
+ flex: 1 0 auto;
.body-container {
- flex: 1;
+ flex: 1 0 auto;
padding-bottom: 30px;
}
}