delete more unnecessary buttons

ubclaunchpad · Nov 27, 2024 · 4ee384a · 4ee384a
1 parent fc60375
commit 4ee384a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 95 deletions.
diff --git a/frontend/src/components/AppBar/AppBar.css b/frontend/src/components/AppBar/AppBar.css
@@ -6,7 +6,7 @@
   top: 0;
   left: 0;
   height: 120px;
-  width: 100vw;
+  width: 98vw;
   padding: 1rem 3rem 1rem 2rem;
   justify-content: space-between;
   align-items: center;
@@ -46,16 +46,16 @@
   box-shadow: 0px 0px 10px #e3e8f2;
 }
 
-.filter-button {
+.app-bar-filter-button {
   display: flex;
   height: 40px;
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  color: #2F3C50 !important;
-  background-color: #FBFCFE !important;
+  color: #2F3C50;
+  background-color: #FBFCFE;
   box-shadow: 0px 0px 10px #e3e8f2;
-  border-radius: 20px !important;
+  border-radius: 20px;
   gap: 10px;
 }
 

diff --git a/frontend/src/components/AppBar/AppBar.jsx b/frontend/src/components/AppBar/AppBar.jsx
@@ -13,7 +13,7 @@ export const AppBar = () => {
         <img src={Logo} className="logo" />
         <div className="search-filter-container">
           <input type="text" className="search-input" name="search" placeholder="Search..." />
-          <button className="filter-button">
+          <button className="app-bar-filter-button">
             <AdjustmentsHorizontalIcon className="app-bar-icon" />
             <p>Filter</p>
           </button>

diff --git a/frontend/src/components/Buttons/HomeButton.jsx b/frontend/src/components/Buttons/HomeButton.jsx
diff --git a/frontend/src/components/Buttons/SignInButton.css b/frontend/src/components/Buttons/SignInButton.css
diff --git a/frontend/src/components/Buttons/SignInButton.jsx b/frontend/src/components/Buttons/SignInButton.jsx
diff --git a/frontend/src/components/Buttons/SignOutButton.css b/frontend/src/components/Buttons/SignOutButton.css
diff --git a/frontend/src/components/Buttons/SignOutButton.jsx b/frontend/src/components/Buttons/SignOutButton.jsx
diff --git a/frontend/src/components/Navbar/Navbar.css b/frontend/src/components/Navbar/Navbar.css
@@ -41,29 +41,22 @@
     background-color: #CDD8F0;
 }
 
-.nav-button-icon-container-selected {
-    height: 60px;
-    width: 60px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 40px;
-    color: #F7FAFF;
+.nav-button.active .nav-button-icon-container {
+    color: #F7FAFF; 
     background-color: #244B94;
 }
 
 .nav-button-icon-container:hover {
+    color: #F7FAFF;
     background-color: #244B94;
-    color: white;
 }
 
 .nav-button-text {
     margin-top: 4px;
     color: #666B6F;
 }
 
-.nav-button-text-selected {
-    margin-top: 4px;
+.nav-button.active .nav-button-text {
     color: #244B94;
     font-weight: bold;
 }

diff --git a/frontend/src/components/Navbar/Navbar.jsx b/frontend/src/components/Navbar/Navbar.jsx
@@ -16,10 +16,10 @@ export const Navbar = () => {
     <nav className="nav-bar">
       <div className="nav-button-container">
         <NavLink className="nav-button" to="/dashboard">
-          <div className="nav-button-icon-container-selected">
+          <div className="nav-button-icon-container">
             <HomeIcon className="nav-icon"/>
           </div>
-          <p className="nav-button-text-selected">Home</p>
+          <p className="nav-button-text">Home</p>
         </NavLink>
         <NavLink className="nav-button" to="/newLog">
           <div className="nav-button-icon-container">

diff --git a/frontend/src/pages/styles/UploadPhoto.css b/frontend/src/pages/styles/UploadPhoto.css
@@ -56,7 +56,7 @@
 
 .page-container {
     display: flex;
-    height: 100vh;
+    height: 98vh;
 }
 
 .main-content {