From 2cb6acc09073b5687958e6ab91b326257d0e55cb Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 4 Apr 2023 23:41:44 -0400
Subject: [PATCH] Small refactor to fix broken error popup

---
 client/homebrew/navbar/error-navitem.jsx    |   2 +-
 client/homebrew/navbar/error-navitem.less   | 144 ++++++++++----------
 client/homebrew/pages/editPage/editPage.jsx |  19 ++-
 3 files changed, 81 insertions(+), 84 deletions(-)

diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx
index efee04019..eb2872c22 100644
--- a/client/homebrew/navbar/error-navitem.jsx
+++ b/client/homebrew/navbar/error-navitem.jsx
@@ -82,4 +82,4 @@ const ErrorNavItem = createClass({
 	}
 });
 
-module.exports = ErrorNavItem;
\ No newline at end of file
+module.exports = ErrorNavItem;
diff --git a/client/homebrew/navbar/error-navitem.less b/client/homebrew/navbar/error-navitem.less
index 8a7cabb19..7e7dab772 100644
--- a/client/homebrew/navbar/error-navitem.less
+++ b/client/homebrew/navbar/error-navitem.less
@@ -1,77 +1,75 @@
-.navItem {
-  &.error {
-    position         : relative;
-    background-color : @red;
-  }
+.navItem.error {
+  position         : relative;
+  background-color : @red;
+}
 
-  .errorContainer{
-    animation-name: glideDown;
-    animation-duration: 0.4s;
-    position         : absolute;
-    top              : 100%;
-    left             : 50%;
-    z-index          : 1000;
-    width            : 140px;
-    padding          : 3px;
-    color            : white;
+.errorContainer{
+  animation-name: glideDown;
+  animation-duration: 0.4s;
+  position         : absolute;
+  top              : 100%;
+  left             : 50%;
+  z-index          : 1000;
+  width            : 140px;
+  padding          : 3px;
+  color            : white;
+  background-color : #333;
+  border           : 3px solid #444;
+  border-radius    : 5px;
+  transform        : translate(-50% + 3px, 10px);
+  text-align       : center;
+  font-size        : 10px;
+  font-weight      : 800;
+  text-transform   : uppercase;
+  a{
+    color : @teal;
+  }
+  &:before {
+    content: "";
+    width: 0px;
+    height: 0px;
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-top: 10px solid transparent;
+    border-bottom: 10px solid #444;
+    left: 53px;
+    top: -23px;
+  }
+  &:after {
+    content: "";
+    width: 0px;
+    height: 0px;
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-top: 10px solid transparent;
+    border-bottom: 10px solid #333;
+    left: 53px;
+    top: -19px;
+  }
+  .deny {
+    width            : 48%;
+    margin           : 1px;
+    padding          : 5px;
     background-color : #333;
-    border           : 3px solid #444;
-    border-radius    : 5px;
-    transform        : translate(-50% + 3px, 10px);
-    text-align       : center;
-    font-size        : 10px;
-    font-weight      : 800;
-    text-transform   : uppercase;
-    a{
-      color : @teal;
-    }
-    &:before {
-      content: "";
-      width: 0px;
-      height: 0px;
-      position: absolute;
-      border-left: 10px solid transparent;
-      border-right: 10px solid transparent;
-      border-top: 10px solid transparent;
-      border-bottom: 10px solid #444;
-      left: 53px;
-      top: -23px;
-    }
-    &:after {
-      content: "";
-      width: 0px;
-      height: 0px;
-      position: absolute;
-      border-left: 10px solid transparent;
-      border-right: 10px solid transparent;
-      border-top: 10px solid transparent;
-      border-bottom: 10px solid #333;
-      left: 53px;
-      top: -19px;
-    }
-    .deny {
-      width            : 48%;
-      margin           : 1px;
-      padding          : 5px;
-      background-color : #333;
-      display          : inline-block;
-      border-left      : 1px solid #666;
-      .animate(background-color);
-      &:hover{
-        background-color : red;
-      }
-    }
-    .confirm {
-      width            : 48%;
-      margin           : 1px;
-      padding          : 5px;
-      background-color : #333;
-      display          : inline-block;
-      color            : white;
-      .animate(background-color);
-      &:hover{
-        background-color : teal;
-      }
+    display          : inline-block;
+    border-left      : 1px solid #666;
+    .animate(background-color);
+    &:hover{
+      background-color : red;
     }
   }
-}
\ No newline at end of file
+  .confirm {
+    width            : 48%;
+    margin           : 1px;
+    padding          : 5px;
+    background-color : #333;
+    display          : inline-block;
+    color            : white;
+    .animate(background-color);
+    &:hover{
+      background-color : teal;
+    }
+  }
+}
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 94d5aef3b..4f2e8f8a2 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -254,6 +254,15 @@ const EditPage = createClass({
 					</div>
 				</div>
 			}
+
+			{this.state.alertTrashedGoogleBrew &&
+				<div className='errorContainer' onClick={this.closeAlerts}>
+				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
+					<div className='confirm'>
+						OK
+					</div>
+				</div>
+			}
 		</Nav.item>;
 	},
 
@@ -335,16 +344,6 @@ const EditPage = createClass({
 		const shareLink = this.processShareId();
 
 		return <Navbar>
-
-			{this.state.alertTrashedGoogleBrew &&
-				<div className='errorContainer' onClick={this.closeAlerts}>
-				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
-					<div className='confirm'>
-						OK
-					</div>
-				</div>
-			}
-
 			<Nav.section>
 				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
 			</Nav.section>