fix(layout): fix IE11 layout

Closes #1227
angular · Jan 19, 2015 · aef0ce6 · aef0ce6
1 parent 581baba
commit aef0ce6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/docs/app/css/style.css b/docs/app/css/style.css
@@ -211,21 +211,30 @@ md-tabs.demo-source-tabs .active md-tab-label {
 .small-demo .demo-content {
   min-height: 128px;
 }
+
+.doc-content > * {
+  -webkit-box-flex: 1 1 auto;
+  -webkit-flex: 1 1 auto;
+  -moz-box-flex: 1 1 auto;
+  -moz-flex: 1 1 auto;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+}
 .demo-content > * {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-  -moz-box-flex: 1;
-  -moz-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
+  -webkit-box-flex: 1 1 0%;
+  -webkit-flex: 1 1 0%;
+  -moz-box-flex: 1 1 0%;
+  -moz-flex: 1 1 0%;
+  -ms-flex: 1 1 0%;
+  flex: 1 1 0%;
 }
-
 .demo-content > div[layout-fill] {
   min-height: 448px;
 }
 .small-demo .demo-content > div[layout-fill] {
   min-height: 224px;
 }
+.layout-content .small-demo .demo-content > div[layout],
 .layout-options .small-demo .demo-content > div[layout] {
   min-height: auto !important;
   max-height: auto !important;

diff --git a/src/components/icon/icon.scss b/src/components/icon/icon.scss
@@ -7,6 +7,8 @@ md-icon {
   background-repeat: no-repeat no-repeat;
   pointer-events: none;
   display: flex;
+  z-index: 0;
+
   object.md-icon {
     display: inline-block;
   }

diff --git a/src/core/style/layout.scss b/src/core/style/layout.scss
@@ -86,7 +86,7 @@
   }
 
   [#{$flexName}] {
-    flex: 1;
+    flex: 1 1 0%;
   }