From e0541eea3d3ab06a2ac552d590c0a6881a027594 Mon Sep 17 00:00:00 2001 From: Daniel Freedman Date: Fri, 13 Sep 2013 11:55:47 -0700 Subject: [PATCH] support ms prefixed flexbox --- elements/g-app.html | 4 ++++ elements/g-ribbon.html | 3 +++ elements/g-toolbar.html | 3 +++ 3 files changed, 10 insertions(+) diff --git a/elements/g-app.html b/elements/g-app.html index 4bd0693..b6f8054 100644 --- a/elements/g-app.html +++ b/elements/g-app.html @@ -87,9 +87,11 @@ /* layout content using flexbox */ display: -webkit-box; display: -webkit-flex; + display: -ms-flexbox; display: flex; -webkit-box-orient: vertical; -webkit-flex-flow: column; + -ms-flex-direction: column; flex-direction: column; /* convenient defaults */ @@ -102,6 +104,7 @@ .flex { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; } @@ -109,6 +112,7 @@ content::-webkit-distributed(.flex) { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; } diff --git a/elements/g-ribbon.html b/elements/g-ribbon.html index aaaaa4c..bcf9847 100644 --- a/elements/g-ribbon.html +++ b/elements/g-ribbon.html @@ -32,9 +32,11 @@ * { display: -webkit-box; display: -webkit-flex; + display: -ms-flexbox; display: flex; -webkit-box-orient: vertical; -webkit-flex-flow: column; + -ms-flex-direction: column; flex-direction: column; background: -webkit-linear-gradient(-60deg, #3d3d3d, #353535); background: -moz-linear-gradient(-60deg, #3d3d3d, #353535); @@ -59,6 +61,7 @@ .menu { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; overflow: auto; } diff --git a/elements/g-toolbar.html b/elements/g-toolbar.html index e866400..cd19257 100644 --- a/elements/g-toolbar.html +++ b/elements/g-toolbar.html @@ -27,9 +27,11 @@ .toolbar { display: -webkit-box; display: -webkit-flex; + display: -ms-flexbox; display: flex; -webkit-box-align: center; -webkit-align-items: center; + -ms-flex-align: center; align-items: center; min-height: 60px; background-color: whitesmoke; @@ -53,6 +55,7 @@ ::-webkit-distributed(.flex) { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; }