Merge branch 'develop'

oeg-upm · Dec 12, 2024 · 666a8a4 · 666a8a4
2 parents a0e6006 + 335c8ec
commit 666a8a4
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inesdata-public-portal-frontend",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "project": "upm-inesdata",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss
@@ -1,7 +1,7 @@
 /* Custom FOOTER component styles */
 
 .footer {
-	background-color: #404040;
+	background-color: #ef7011;
 	padding: 50px 40px;
 	width: 100%;
 	bottom: 0;

diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html
@@ -4,7 +4,7 @@
 		<ng-template pTemplate="start">
 			<h1 role="banner" class="header__logo">
 				<a class="header__logo__link" routerLink="home">
-					<img src="../../../../assets/images/logo.svg" alt="Logo">
+					<img src="../../../../assets/images/logo.png" alt="Logo">
 				</a>
 			</h1>
 		</ng-template>

diff --git a/src/app/shared/components/header/header.component.scss b/src/app/shared/components/header/header.component.scss
@@ -46,7 +46,7 @@
 	font-family: fantasy;
 	font-style: oblique;
 	font-weight: lighter;
-	margin-left: 0.5em;
+	margin-left: 60px;
 	color: #404040;
 }
 
@@ -58,3 +58,26 @@
 	}
 }
 
+.header__logo {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	margin: 0 auto;
+}
+
+.header__logo__link img {
+	width: 300px;
+	height: auto;
+	display: block;
+	margin: 0 auto;
+}
+
+header {
+	background-color: #ef7011;
+	margin-left: -60px;
+	margin-right: -60px;
+	margin-bottom: 30px;
+}
+
+
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
diff --git a/src/favicon.ico b/src/favicon.ico
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
@@ -52,14 +52,15 @@ button {
 	font-family: "Baloo 2", Helvetica, Arial, sans-serif;
 	justify-content: space-between;
 	background-color: unset;
+	padding: 15px;
 }
 
 .p-menubar .p-menubar-end {
 	margin-left: unset;
 }
 
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-content .p-menuitem-link .p-menuitem-text {
-	color: #4367bc;
+	color: #fff;
 }
 
 .p-menubar .p-menubar-root-list > .p-menuitem:not(.p-highlight):not(.p-disabled) > .p-menuitem-content:hover {