Merge pull request #127 from JumboCode/holden

fixed more bugs because why not

Author: hkittelberger

frontend/src/app/components/BorrowPopup.css

@@ -24,7 +24,7 @@
 
 }
 
-   .container {
+   .containerBorrow {
     display: flex;
     flex-direction: row;
     height: 100%;

frontend/src/app/components/BorrowPopup.jsx

@@ -218,7 +218,7 @@ const BorrowPopup = ({ selectedItems = [], onClose, onSuccess }) => {
   };
 
   return (
-    <div className="container">
+    <div className="containerBorrow">
 
       {/* Top header */}
       <div className="borrowItemsHeader">

frontend/src/app/components/SettingsPage.css

@@ -43,7 +43,7 @@
   margin-bottom: 25px;
 }
 
-.body {
+.bodySettings {
   font-family: Arial, sans-serif;
   display: flex;
   align-items: flex-start;
@@ -101,7 +101,7 @@ h1 {
     box-shadow: 0px .1rem .2rem 0px rgba(0, 0, 0, 0.25);
 }
 
-  form {
+  .profile-form {
     display: flex;
     flex-direction: column;
     align-items: center;

frontend/src/app/components/SettingsPage.jsx

@@ -123,7 +123,7 @@ export default function SettingsPage() {
         <div className="account-header">
           <h2 className="account-subheading">Account Information & Options</h2>
         </div>
-        <div className="body">
+        <div className="bodySettings">
           <div className="left-column">
             {user && (
             <div className="profile-card">
@@ -146,7 +146,7 @@ export default function SettingsPage() {
                   disabled
                 />
               </div>
-              <form>
+              <form className="profile-form">
                 <label htmlFor="email">Email</label>
                 <input
                   type="email"

frontend/src/app/inventory/15Tablecomp/PrePopup.jsx

@@ -79,8 +79,8 @@ export default function PrePopup({ unit, onClose, onOptionSelect, position, stat
 
     return (
         <div className="Popup" 
-              style = {{top: position.top, right: position.right}}
-              ref={popupRef}>
+             style={{ top: position.top, right: `calc(${position.right} + 9px)` }}
+             ref={popupRef}>
             <div className="Buttons">
                 <div className="editBtn">
                      <svg xmlns="http://www.w3.org/2000/svg" width="20" height="21" viewBox="0 0 20 21" fill="none">

frontend/src/app/settings/page.jsx

@@ -20,7 +20,11 @@ const Settings = () => {
       <div className="settings-header">
         <h1 className="settings-title">Settings</h1>
       </div>
+<<<<<<< HEAD
+      <div className="containerSettings">
+=======
       <div className="containerS">
+>>>>>>> 35dd92777be9c96bb74d0b87fdf1da3bf587f146
         <div className="settings-content-wrapper">
             <div className="settings-page">
               <SettingsPage />

frontend/src/app/settings/settings.css

@@ -110,7 +110,7 @@
     width: 100%;
   }
 
-  .containerS {
+  .containerSettings {
     margin-top: 5rem;
     display: flex;
     justify-content: center;