mirror of
				https://github.com/cse110-fa22-group29/cse110-fa22-group29.git
				synced 2025-10-30 19:46:49 +00:00 
			
		
		
		
	fix homepage structal issues,
TODO: clean css Signed-off-by: Arthur Lu <learthurgo@gmail.com>
This commit is contained in:
		| @@ -2,51 +2,53 @@ | |||||||
| <!DOCTYPE html> | <!DOCTYPE html> | ||||||
| <html lang="en"> | <html lang="en"> | ||||||
| <head> | <head> | ||||||
|   <meta charset="UTF-8" /> | 	<meta charset="UTF-8" /> | ||||||
|   <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | 	<meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||||||
|   <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | 	<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||||||
|   <title>Food Journal</title> | 	<title>Food Journal</title> | ||||||
|  |  | ||||||
|   <!-- Recipe Card Custom Element --> | 	<!-- Recipe Card Custom Element --> | ||||||
|   <script src="assets/scripts/ReviewCard.js" type="module"></script> | 	<script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||||
|  |  | ||||||
|   <!-- Main Stylesheets & Scripts -->  |  | ||||||
|   <!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> |  | ||||||
|   <!-- <link rel="stylesheet" href="/static/reset.css" /> --> |  | ||||||
|   <link rel="stylesheet" href="./static/homepage.css" /> |  | ||||||
|   <script src="assets/scripts/main.js" type="module"></script> |  | ||||||
|  |  | ||||||
|  | 	<!-- Main Stylesheets & Scripts -->  | ||||||
|  | 	<!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | ||||||
|  | 	<!-- <link rel="stylesheet" href="/static/reset.css" /> --> | ||||||
|  | 	<link rel="stylesheet" href="./static/homepage.css" /> | ||||||
|  | 	<script src="assets/scripts/main.js" type="module"></script> | ||||||
| </head> | </head> | ||||||
| <body> | <main> | ||||||
|   <div class ="Top-Bar"> | 	<header> | ||||||
|     <img src ="./assets/images/icons/Logo.png" alt="logo" /> | 		<div class="Top-Bar" style="display: flex; justify-content: center;"> | ||||||
|     <h1 style="font-family:'Lucida Sans'"> Food Journal </h1> | 			<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" /> | ||||||
|     <form id="form"> | 			<h1 style="font-family:'Lucida Sans';"> Food Journal </h1> | ||||||
|         <input type='search' id="seaching" name="searchBar" placeholder="Search journal..."> | 			<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" /> | ||||||
|         <button class="click" type="search"> | 		</div> | ||||||
|             Search | 	</header> | ||||||
|         </button> |   	<body> | ||||||
|     </form> | 		 | ||||||
|   </div> | 		<div style="display: flex; max-height: 100%;"> | ||||||
|     <!-- | 			<div style="width: 20%;"></div> | ||||||
|     <form id="form"> |  | ||||||
|         <input type='search' id="seaching" name="searchBar" placeholder="Search journal..."> | 			<div style="width: 60%;"> | ||||||
|         <button class="click" type="search"> | 				<div style="display: flex; flex-direction: row; justify-content: center;">		 | ||||||
|             Search | 					<img src ="./assets/images/icons/Grouppink.png" alt="CREATE" style="align-self: center;" id="create-btn" onclick="window.location.assign('./CreatePage.html')"></img> | ||||||
|         </button> | 					<h2 id="recent-reviews-text"> Recent Reviews </h2> | ||||||
|     </form> | 					<img src ="./assets/images/icons/Grouppink.png" alt="" style="align-self: center; opacity:0;"></img> | ||||||
|     ---> | 				</div> | ||||||
|   <main> |  | ||||||
|     <!-- Add Food Entries Here --> | 				<div class="review-container" id="review-container"></div> | ||||||
|     <div class="Review-boxes"> | 			</div> | ||||||
|       <h2> Recent Reviews </h2> |  | ||||||
|       <img src ="./assets/images/icons/Grouppink.png" alt="CREATE" id="create-btn" onclick="window.location.assign('./CreatePage.html')"></img> | 			<div style="width: 20%;"> | ||||||
|        | 				<form id="form" style="display: none;"> | ||||||
|     </div> | 					<input type='search' id="seaching" name="searchBar" placeholder="Search journal..."> | ||||||
|       <div class="Filter-box"> | 					<button class="click" type="search"> | ||||||
|     </div> | 						Search | ||||||
|     <div class="review-container" id="review-container"></div> | 					</button> | ||||||
|   </main> | 					<div class="Filter-box"></div> | ||||||
|   <!--<button type="button" id="create-btn"><a href='./CreatePage.html'></a>CREATE</button>--> | 				</form> | ||||||
| </body> | 			</div> | ||||||
|  | 		</div> | ||||||
|  |   	</body> | ||||||
|  | </main> | ||||||
| </html> | </html> | ||||||
|   | |||||||
| @@ -6,65 +6,48 @@ body{ | |||||||
| .Top-Bar{ | .Top-Bar{ | ||||||
| } | } | ||||||
| .Top-Bar > img{ | .Top-Bar > img{ | ||||||
|     position: absolute; |     position: relative; | ||||||
| } | } | ||||||
| .Top-Bar > h1{ | .Top-Bar > h1{ | ||||||
|     position: relative; |     position: relative; | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     font-size: 5rem; |  | ||||||
|     color: #E4C3D2; |     color: #E4C3D2; | ||||||
|  |     font-size: 100px; | ||||||
|     font-family: 'Lucida Sans'; |     font-family: 'Lucida Sans'; | ||||||
|     padding: 25px 0px 0px 0px; |  | ||||||
|     font-weight: 900; |  | ||||||
|     margin: 0px |  | ||||||
| } | } | ||||||
| .Top-Bar > form{ | .Top-Bar > form{ | ||||||
|     position: relative; |     position: relative; | ||||||
|     float: right; |     float: right; | ||||||
|     margin-right: 12%; |  | ||||||
| } | } | ||||||
| .Review-boxes { | .Review-boxes { | ||||||
|     position: relative; |     position: relative; | ||||||
| } | } | ||||||
|  |  | ||||||
| .Review-boxes > h2 { | #recent-reviews-text { | ||||||
|     font-family: 'Lucida Sans'; |     font-family: 'Lucida Sans'; | ||||||
|     display: block; |  | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     font-size: 2.7rem; |     font-size: 80px; | ||||||
|     color: #E4C3D2; |     color: #E4C3D2; | ||||||
|     margin-top: 2.5em; |  | ||||||
| } | } | ||||||
| .Review-boxes > input { | .Review-boxes > input { | ||||||
|     position: relative; |     position: relative; | ||||||
|     left: 20.34cm; |  | ||||||
|     top: -3.5cm; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| img#create-btn { | img#create-btn { | ||||||
|     position: absolute; |     position: relative; | ||||||
|     left: 12%; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| .Filter-box{ | .Filter-box{ | ||||||
|     width: 200px; |  | ||||||
|     height: 400px; |  | ||||||
|     background: #e4d9e9; |     background: #e4d9e9; | ||||||
|     position: absolute; |     position: absolute; | ||||||
|     border: 5px solid #99a2c2; |     border: 5px solid #99a2c2; | ||||||
|     right: 12%; |  | ||||||
| } | } | ||||||
| .review-container{ | .review-container{ | ||||||
|     display: flex; |     display: flex; | ||||||
|     position: relative; |     position: relative; | ||||||
|     margin-left: 25%; |     flex-wrap: wrap; | ||||||
| } | } | ||||||
| .review-container > div { | .review-container > div { | ||||||
|     background-color: #f1f1f1; |     background-color: #f1f1f1; | ||||||
|     width: 200px; |  | ||||||
|     height: 200px; |  | ||||||
|     margin: 10px; |  | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     line-height: 75px; |  | ||||||
|     font-size: 30px; |  | ||||||
|   } |   } | ||||||
		Reference in New Issue
	
	Block a user