mirror of
				https://github.com/cse110-fa22-group29/cse110-fa22-group29.git
				synced 2025-10-31 03:46:50 +00:00 
			
		
		
		
	Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details
This commit is contained in:
		| @@ -7,6 +7,9 @@ | |||||||
| 		<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> | ||||||
|  |  | ||||||
|  | 		<!--Add Favicon--> | ||||||
|  | 		<link rel="icon" type="image/x-icon" href="./assets/images/icons/favicon.ico"> | ||||||
|  |  | ||||||
| 		<!-- 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> | ||||||
|  |  | ||||||
| @@ -16,7 +19,6 @@ | |||||||
| 		<!-- <link rel="stylesheet" href="/static/reset.css" /> --> | 		<!-- <link rel="stylesheet" href="/static/reset.css" /> --> | ||||||
| 		<link rel="stylesheet" href="./static/CreatePage.css" /> | 		<link rel="stylesheet" href="./static/CreatePage.css" /> | ||||||
| 		<link rel="stylesheet" href="./static/Form.css" /> | 		<link rel="stylesheet" href="./static/Form.css" /> | ||||||
| 		<link rel="icon" href="./assets/images/icons/favicon.ico"> |  | ||||||
| 		<script src="./assets/scripts/CreatePage.js" type="module"></script> | 		<script src="./assets/scripts/CreatePage.js" type="module"></script> | ||||||
| 	</head> | 	</head> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -6,9 +6,14 @@ | |||||||
| 		<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> | ||||||
|  |  | ||||||
|  | 		<!--Add Favicon--> | ||||||
|  | 		<link rel="icon" type="image/x-icon" href="./assets/images/icons/favicon.ico"> | ||||||
|  |  | ||||||
| 		<!-- 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 -->  | 		<!-- Main Stylesheets & Scripts -->  | ||||||
| 		<!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | 		<!-- 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/reset.css" /> --> | ||||||
|   | |||||||
| @@ -7,6 +7,9 @@ | |||||||
| 		<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> | ||||||
|  |  | ||||||
|  | 		<!--Add Favicon--> | ||||||
|  | 		<link rel="icon" type="image/x-icon" href="./assets/images/icons/favicon.ico"> | ||||||
|  |  | ||||||
| 		<!-- 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> | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user