From 3c6b6e9764af5ce50be4bdaef853ec16e69e0091 Mon Sep 17 00:00:00 2001 From: Arlo Belshee Date: Wed, 27 Aug 2014 13:53:47 -0700 Subject: [PATCH 1/2] Corrected CSS values for Flexbox model for official CSS3 & for IE. --- src/style/main.css | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/style/main.css b/src/style/main.css index 51d0e8ad..1be8a1cf 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -66,39 +66,39 @@ div.modalTerminal p { html, body, .box { - display: box; + display: flex; display: -moz-box; display: -webkit-box; - display: -ms-box; + display: -ms-flexbox; } body, .flex1 { -webkit-box-flex: 1; -moz-box-flex: 1; - -ms-box-flex: 1; - box-flex: 1; + -ms-flex: 1.0; + flex: 1; } .flex2 { -webkit-box-flex: 2; -moz-box-flex: 2; - -ms-box-flex: 2; - box-flex: 2; + -ms-flex: 2.0; + flex: 2; } .flex3 { -webkit-box-flex: 3; -moz-box-flex: 3; - -ms-box-flex: 3; - box-flex: 3; + -ms-flex: 3.0; + flex: 3; } .flex10 { -webkit-box-flex: 10; -moz-box-flex: 10; - -ms-box-flex: 10; - box-flex: 10; + -ms-flex: 10.0; + flex: 10; } html, @@ -106,43 +106,43 @@ body, .vertical { -webkit-box-orient: vertical; -moz-box-orient: vertical; - -ms-box-orient: vertical; - box-orient: vertical; + -ms-flex-direction: column; + flex-direction: column; } .horizontal { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; - -ms-box-orient: horizontal; - box-orient: horizontal; + -ms-flex-direction: row; + flex-direction: row; } .centerAlign { -webkit-box-align: center; -moz-box-align: center; - -ms-box-align: center; - box-align: center; + -ms-flex-align: center; + justify-content : center; } .startAlign { -webkit-box-align: start; -moz-box-align: start; - -ms-box-align: start; - box-align: start; + -ms-flex-align: start; + justify-content: flex-start; } .center { -webkit-box-pack: center; -moz-box-pack: center; - -ms-box-pack: center; - box-pack: center; + -ms-flex-pack: center; + align-content: center; } .justify { -webkit-box-pack: justify; -moz-box-pack: justify; - -ms-box-pack: justify; - box-pack: justify; + -ms-flex-pack: justify; + align-content: stretch; } /* Transition */ From 03816a2850e141ed71d67a1f61a27ea7c31550c4 Mon Sep 17 00:00:00 2001 From: Arlo Belshee Date: Thu, 28 Aug 2014 11:29:50 -0700 Subject: [PATCH 2/2] Missed one before. Now using the official setting for display. --- src/style/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/main.css b/src/style/main.css index 1be8a1cf..c3ed958e 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -66,7 +66,7 @@ div.modalTerminal p { html, body, .box { - display: flex; + display: flexbox; display: -moz-box; display: -webkit-box; display: -ms-flexbox;