From 1f84285d99003d1d26ab2cb5fdc7d149a9e9f719 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Fri, 23 Mar 2018 09:57:37 +0000
Subject: [PATCH] Move the field error indicators in front of the affected
 fields so they don't obscure spinners or drop downs etc. Fixes #3226

---
 docs/en_US/release_notes_3_0.rst                 | 3 ++-
 web/pgadmin/static/css/bootstrap.overrides.css   | 2 +-
 web/pgadmin/static/css/pgadmin.css               | 2 +-
 web/pgadmin/static/scss/_backform.overrides.scss | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/en_US/release_notes_3_0.rst b/docs/en_US/release_notes_3_0.rst
index 851354a88..06e6aa89c 100644
--- a/docs/en_US/release_notes_3_0.rst
+++ b/docs/en_US/release_notes_3_0.rst
@@ -108,4 +108,5 @@ Bug fixes
 | `Bug #3196 <https://redmine.postgresql.org/issues/3196>`_ - Ensure the file manager properly escapes file & directory names
 | `Bug #3197 <https://redmine.postgresql.org/issues/3197>`_ - Appropriately set the cookie path
 | `Bug #3200 <https://redmine.postgresql.org/issues/3200>`_ - Ensure the host parameter is correctly pickup up from the service file
-| `Bug #3219 <https://redmine.postgresql.org/issues/3219>`_ - Update required ChromeDriver version for current versions of Chrome
\ No newline at end of file
+| `Bug #3219 <https://redmine.postgresql.org/issues/3219>`_ - Update required ChromeDriver version for current versions of Chrome
+| `Bug #3226 <https://redmine.postgresql.org/issues/3226>`_ - Move the field error indicators in front of the affected fields so they don't obscure spinners or drop downs etc.
\ No newline at end of file
diff --git a/web/pgadmin/static/css/bootstrap.overrides.css b/web/pgadmin/static/css/bootstrap.overrides.css
index d2936a723..2ab44f0ec 100755
--- a/web/pgadmin/static/css/bootstrap.overrides.css
+++ b/web/pgadmin/static/css/bootstrap.overrides.css
@@ -269,7 +269,7 @@ iframe {
 
 .control-label {
     margin: 0px;
-    padding: 5px;
+    padding: 5px 25px 5px 5px;
     display: inline-block;
     vertical-align: middle;
 }
diff --git a/web/pgadmin/static/css/pgadmin.css b/web/pgadmin/static/css/pgadmin.css
index 6c1002ca9..666140e29 100644
--- a/web/pgadmin/static/css/pgadmin.css
+++ b/web/pgadmin/static/css/pgadmin.css
@@ -732,7 +732,7 @@ lgg-el-container[el=md] .pg-el-lg-8,
   padding-top: 6px;
   padding-bottom: 6px;
   padding-left: 5px;
-  padding-right: 5px;
+  padding-right: 25px;
   display: inline-block;
   vertical-align: middle;
   min-height: 28px;
diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss
index 2aa9460dd..b22c55a1f 100644
--- a/web/pgadmin/static/scss/_backform.overrides.scss
+++ b/web/pgadmin/static/scss/_backform.overrides.scss
@@ -8,14 +8,14 @@
     color: #d0021b;
   }
 
-  .pgadmin-controls:before {
+  .control-label:before {
     font: normal normal normal 16px/1 FontAwesome;
     content: "\f071";
     text-decoration: inherit;
     position: absolute;
     color: #d0021b;
-    right: 15px;
-    padding-top: 10px;
+    right: 6px;
+    padding-top: 6px;
     z-index: 1;
   }
 }