From a013a19c6832c87f024867bebfda00217cd9da66 Mon Sep 17 00:00:00 2001 From: Daniel Freedman Date: Fri, 13 Sep 2013 11:48:35 -0700 Subject: [PATCH] use prefixed flexbox in IE 10 --- pica/components/css/pi-accounts.css | 5 ++++- pica/components/css/pi-app.css | 5 +++++ pica/components/css/pi-feed-viewer.css | 2 ++ pica/components/css/pi-items-view.css | 3 +++ pica/components/css/pi-toolbar.css | 6 +++++- pica/index.html | 4 ---- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pica/components/css/pi-accounts.css b/pica/components/css/pi-accounts.css index 7a6b601..ce40af5 100644 --- a/pica/components/css/pi-accounts.css +++ b/pica/components/css/pi-accounts.css @@ -19,9 +19,11 @@ .item { 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; height: 60px; padding: 0 20px; @@ -51,6 +53,7 @@ display: -webkit-box; -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; } @@ -96,4 +99,4 @@ .button:active { box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); color: #555; -} \ No newline at end of file +} diff --git a/pica/components/css/pi-app.css b/pica/components/css/pi-app.css index 358a00e..e8b69d8 100644 --- a/pica/components/css/pi-app.css +++ b/pica/components/css/pi-app.css @@ -14,10 +14,12 @@ /* layout content using flexbox */ display: -webkit-box; + display: -ms-flexbox; display: -webkit-flex; display: flex; -webkit-box-orient: vertical; -webkit-flex-flow: column; + -ms-flex-direction: column; flex-direction: column; /* convenient defaults */ @@ -29,6 +31,7 @@ #panels, #contentPanels, #Topics { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; overflow: hidden; } @@ -46,9 +49,11 @@ #main { 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: white; } diff --git a/pica/components/css/pi-feed-viewer.css b/pica/components/css/pi-feed-viewer.css index 095c632..dab3739 100644 --- a/pica/components/css/pi-feed-viewer.css +++ b/pica/components/css/pi-feed-viewer.css @@ -7,6 +7,7 @@ * { display: -webkit-box; display: -webkit-flex; + display: -ms-flexbox; display: flex; } } @@ -14,6 +15,7 @@ .feed-viewer-panels { -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; position: relative; } diff --git a/pica/components/css/pi-items-view.css b/pica/components/css/pi-items-view.css index 6f79cc9..5bdd45b 100644 --- a/pica/components/css/pi-items-view.css +++ b/pica/components/css/pi-items-view.css @@ -127,9 +127,11 @@ #more { 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; float: none; width: 100%; @@ -225,6 +227,7 @@ .column #more { display: -webkit-inline-box; display: -webkit-inline-flex; + display: -ms-inline-flexbox; display: inline-flex; width: 150px; min-width: 0; diff --git a/pica/components/css/pi-toolbar.css b/pica/components/css/pi-toolbar.css index 21cf781..5c59c5b 100644 --- a/pica/components/css/pi-toolbar.css +++ b/pica/components/css/pi-toolbar.css @@ -7,8 +7,12 @@ /*@polyfill #actionbar > .toolbar > *:not(:last-child):not([hidden]) */ #actionbar content::-webkit-distributed(*:not(:last-child):not([hidden])) { display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; -webkit-box-flex: 1; -webkit-flex: 1; + -ms-flex: 1; flex: 1; } -} \ No newline at end of file +} diff --git a/pica/index.html b/pica/index.html index 187f776..6162c7f 100644 --- a/pica/index.html +++ b/pica/index.html @@ -9,13 +9,9 @@ Pica - -