Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amélioration de l'UI de la landing page #53

Merged
merged 10 commits into from
Jan 15, 2021
Merged

Amélioration de l'UI de la landing page #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c995fbf
add divider
Forster-Groux Jan 13, 2021
2f5e8c9
improve presentation block ui
Forster-Groux Jan 13, 2021
30ffa39
improve key goals block ui
Forster-Groux Jan 13, 2021
fd08475
improve goal block ui
Forster-Groux Jan 13, 2021
d413c54
improve navbar ui
Forster-Groux Jan 14, 2021
5afe8e3
add hover effect on measure-item
Forster-Groux Jan 14, 2021
c3e1343
fixed navbar
Forster-Groux Jan 14, 2021
2958cdc
use p tag
Forster-Groux Jan 15, 2021
6b88e77
add calculator file download
Forster-Groux Jan 15, 2021
33c167a
add alt tag on images
Forster-Groux Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added front-end/public/Diagnostic approvisionnement (ma-cantine-alpha) v0.1.ods
View file
Open in desktop
Binary file not shown.
13 changes: 12 additions & 1 deletion front-end/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<template>
<TheNavbar/>

<router-view/>
<div id="router-view">
<router-view/>
</div>
hfroot marked this conversation as resolved.
Show resolved Hide resolved

<TheFooter/>
</template>
Expand Down Expand Up @@ -40,4 +42,13 @@ export default {
text-align: center;
color: #2c3e50;
}

#router-view {
margin-top: 100px;
}

ul {
list-style-type: none;
padding: 0;
}
</style>
Binary file added front-end/src/assets/divider-section.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed front-end/src/assets/plate.png
View file
Open in desktop
Binary file not shown.
37 changes: 20 additions & 17 deletions front-end/src/components/TheNavbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<div id="navbar">
<router-link :to="{ name: 'LandingPage' }" id="landing">
<router-link :to="{ name: 'LandingPage' }" id="goto-landing">
<img src="@/assets/Marianne.png" id="Marianne">
<div id="logo">
<div id="ma-cantine-beta-gouv"><span id="ma-cantine">ma-cantine</span>.beta.gouv.fr</div>
<div id="egalim">Pour une alimentatation saine, de qualité et plus durable dans nos assiettes grâce à EGAlim</div>
<div id="brand">
hfroot marked this conversation as resolved.
Show resolved Hide resolved
<div id="logo"><span id="ma-cantine">ma-cantine</span>.beta.gouv.fr</div>
<div id="slogan">Pour une alimentation saine, de qualité et plus durable dans nos assiettes grâce à EGAlim</div>
</div>
</router-link>
<router-link :to="{ name: 'KeyMeasuresPage' }" :active="isActive" class="navbar-item">Mesures phares</router-link>
<router-link :to="{ name: 'KeyMeasuresPage' }" class="navbar-item">Mesures phares</router-link>
<a class="navbar-item" href="https://beta.gouv.fr/startups/egalim.html" target="_blank">
À propos <i class="fas fa-external-link-alt"></i>
</a>
Expand All @@ -27,30 +27,36 @@ a {
}

#navbar {
top: 0;
z-index: 1000;
position: fixed;
width: 96%;
padding: 10px 2%;
display: flex;
justify-content: space-between;
padding: 10px 50px;
border-bottom: 1px solid #E1E1E1;
background-color: white;
}

#landing {
#goto-landing {
display: flex;
}

#Marianne {
height: 75px;
}

#logo {
#brand {
display: flex;
flex-direction: column;
justify-content: space-around;
margin-left: 30px;
margin-left: 50px;
text-align: left;
width: 300px;
max-width: 300px;
text-decoration: none;
}

#ma-cantine-beta-gouv {
#logo {
font-style: italic;
font-weight: 200;
font-size: 25px;
Expand All @@ -60,10 +66,10 @@ a {

#ma-cantine {
font-weight: bold;
color: #F7B48E;
color: #EB5B25;
}

#egalim {
#slogan {
font-size: 11px;
font-weight: 600;
line-height: 15px;
Expand All @@ -75,14 +81,11 @@ a {
border-radius: 25px;
padding: 15px;
font-size: 17px;
font-weight: bold;
line-height: 20px;
color: rgba(64, 64, 64, 0.85);
}

.navbar-item.router-link-active {
font-weight: 800;
}

.navbar-item:hover {
color: white;
background-color: #F7B48E;
Expand Down
Loading