From e6945c646b276906fc66f18d17f5566aa114e4bb Mon Sep 17 00:00:00 2001 From: Arlo Belshee Date: Tue, 2 Sep 2014 17:45:32 -0700 Subject: [PATCH] Updated the flex styles to bias to auto size, rather than 0 size. Since the bias is only used by IE (though part of the standard), this was causing a break in IE but "worked" in current versions of other browsers...for now. --- src/style/main.css | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/style/main.css b/src/style/main.css index c3ed958e..6b524eac 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -1,3 +1,9 @@ +/* Partial reset */ +p, div { + display: block; +} + +/* Main styles */ html { height: 100%; } @@ -66,7 +72,7 @@ div.modalTerminal p { html, body, .box { - display: flexbox; + display: flex; display: -moz-box; display: -webkit-box; display: -ms-flexbox; @@ -76,29 +82,29 @@ body, .flex1 { -webkit-box-flex: 1; -moz-box-flex: 1; - -ms-flex: 1.0; - flex: 1; + -ms-flex: 1.0 1.0 auto; + flex: 1 1 auto; } .flex2 { -webkit-box-flex: 2; -moz-box-flex: 2; - -ms-flex: 2.0; - flex: 2; + -ms-flex: 2.0 2.0 auto; + flex: 2 2 auto; } .flex3 { -webkit-box-flex: 3; -moz-box-flex: 3; - -ms-flex: 3.0; - flex: 3; + -ms-flex: 3.0 3.0 auto; + flex: 3 3 auto; } .flex10 { -webkit-box-flex: 10; -moz-box-flex: 10; - -ms-flex: 10.0; - flex: 10; + -ms-flex: 10.0 10.0 auto; + flex: 10 10 auto; } html,