From 543e66eb00a877ebaa66d247c5d039918e6e9e5e Mon Sep 17 00:00:00 2001
From: Joe Cheng <joe@rstudio.com>
Date: Wed, 20 Jan 2016 09:18:15 -0800
Subject: [PATCH] Fix flexCol on RStudio Desktop for Win/Linux

RStudio Desktop requires the older -webkit vendor-prefixed
flex box properties. I missed the one for flex-direction.
---
 NEWS                 | 1 +
 R/bootstrap-layout.R | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 90fe991f6..c20e7e531 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 shiny 0.13.0.9000
 --------------------------------------------------------------------------------
 
+* `flexCol` did not work on RStudio for Windows or Linux.
 
 shiny 0.13.0
 --------------------------------------------------------------------------------
diff --git a/R/bootstrap-layout.R b/R/bootstrap-layout.R
index dbafa66c2..b9898eea8 100644
--- a/R/bootstrap-layout.R
+++ b/R/bootstrap-layout.R
@@ -525,6 +525,8 @@ flexfill <- function(..., direction, flex, width = width, height = height) {
       display = "-webkit-flex",
       display = "-ms-flexbox",
       display = "flex",
+      .webkit.flex.direction = direction,
+      .ms.flex.direction = direction,
       flex.direction = direction,
       width = validateCssUnit(width),
       height = validateCssUnit(height)