From 1aa5f673d22d24b90fbd8e14ada269f387b99870 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 4 Apr 2018 14:18:31 -0400
Subject: [PATCH] Force block display for form-rows for now, instead of using
 flex

---
 client/galaxy/style/scss/base.scss |  1 +
 static/style/blue/base.css         | 14 ++++++++------
 templates/user/login.mako          |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
index a6439b5af428..05a565fdc49d 100644
--- a/client/galaxy/style/scss/base.scss
+++ b/client/galaxy/style/scss/base.scss
@@ -723,6 +723,7 @@ textarea {
         // -webkit-box-sizing: border-box;
         max-width: 90%;
     }
+    display: block;
 }
 
 textarea,
diff --git a/static/style/blue/base.css b/static/style/blue/base.css
index 9f994469e6a0..9a72602ea99f 100644
--- a/static/style/blue/base.css
+++ b/static/style/blue/base.css
@@ -12697,12 +12697,14 @@ input,
 textarea {
   font: inherit; }
 
-.form-row select,
-.form-row textarea,
-.form-row input[type="text"],
-.form-row input[type="file"],
-.form-row input[type="password"] {
-  max-width: 90%; }
+.form-row {
+  display: block; }
+  .form-row select,
+  .form-row textarea,
+  .form-row input[type="text"],
+  .form-row input[type="file"],
+  .form-row input[type="password"] {
+    max-width: 90%; }
 
 textarea,
 input[type="text"],
diff --git a/templates/user/login.mako b/templates/user/login.mako
index 352593d578d8..027099392c0a 100644
--- a/templates/user/login.mako
+++ b/templates/user/login.mako
@@ -80,12 +80,12 @@ def inherit(context):
         <div class="toolFormTitle">Login</div>
         <form name="login" id="login" action="${form_action}" method="post" >
             <input type="hidden" name="session_csrf_token" value="${trans.session_csrf_token}" />
-            <div class="form-row flex-column">
+            <div class="form-row">
                 <label>Username / Email Address:</label>
                 <input type="text" name="login" value="${login or ''| h}" size="40"/>
                 <input type="hidden" name="redirect" value="${redirect | h}" size="40"/>
             </div>
-            <div class="form-row flex-column">
+            <div class="form-row">
                 <label>Password:</label>
                 <input type="password" name="password" value="" size="40"/>
                 <div class="toolParamHelp" style="clear: both;">