Commit 53f1566d authored by Silvana's avatar Silvana

modifications in Home page and merge

parent a0886937
......@@ -2,16 +2,15 @@
<div id="app">
<header class="banner">
<div class="container row center">
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/31/Eurecom.svg/2000px-Eurecom.svg.png" alt="Eurecom Logo">
<!-- <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/31/Eurecom.svg/2000px-Eurecom.svg.png" alt="Eurecom Logo"> -->
<span>WebInt Project</span>
</div>
</header>
<div class="content">
</div>
<main class="content">
<router-view></router-view>
</main>
<div class="content">
<router-view></router-view>
</div>
</div>
......
header.banner {
background: #0083dc;
background: #f2f2f2;
z-index: 999;
position: fixed;
top: 0;
......
<template lang="html">
<template>
<div >
<h2>
Recipe
......@@ -40,7 +40,8 @@
<div v-for="cat in categories">
<div class="recipe-item">
<img src="../assets/waffle.jpg">
<p>Content</p>
<p class="title">Delicious waffle</p>
<p class="desc">This Classic Waffle Recipe makes perfectly crisp waffles with fluffy insides that are to die for! Made with simple ingredients you already have.</p>
</div>
</div>
</div>
......@@ -70,13 +71,6 @@ export default {
</script>
<style>
.greeting {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
flex-direction: column;
}
.top-categories img {
width: 100px;
height: 100px;
......@@ -89,13 +83,19 @@ export default {
.recipe-item {
padding: 10px;
width: 300px;
}
.recipe-item img {
width: 300px;
height: 200px;
object-fit: cover;
}
.recipe-item .title {
font-weight: bold;
}
.recipe-item .desc {
text-align: justify;
font-size: 0.8em;
}
</style>
<template lang="html">
<div id="app">
<div id="profile">
<tab :tabtitles="tabtitles"
:current-page="3">
<div class="tab-content-container">
......@@ -155,13 +155,12 @@
margin: 0px auto;
}
#app {
#profile {
color: #2c3e50;
margin-top: 50px;
max-width: 500px;
width: 100%;
font-family: Source Sans Pro, Helvetica, sans-serif;
/*text-align: center;*/
margin: 0 auto
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment