Skip to content

Commit

Permalink
refactoring titles styles
Browse files Browse the repository at this point in the history
  • Loading branch information
NadeigeC committed Sep 4, 2023
1 parent 8772cfe commit efca365
Show file tree
Hide file tree
Showing 17 changed files with 422 additions and 424 deletions.
594 changes: 297 additions & 297 deletions frontend/package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
},
"dependencies": {
"@gouvfr/dsfr": "~1.10.0",
"@gouvminint/vue-dsfr": "4.5.1",
"@gouvminint/vue-dsfr": "4.6.0",
"@vue/compat": "^3.3.4",
"@vueuse/core": "^10.3.0",
"axios": "^1.4.0",
"@vueuse/core": "^10.4.1",
"axios": "^1.5.0",
"pinia": "^2.1.6",
"stylelint-config-recommended-vue": "^1.5.0",
"swiper": "^10.2.0",
Expand All @@ -30,11 +30,11 @@
},
"devDependencies": {
"@testing-library/cypress": "^9.0.0",
"@unocss/transformer-directives": "^0.55.2",
"@unocss/transformer-variant-group": "^0.55.2",
"@vitejs/plugin-vue": "^4.3.3",
"cypress": "^12.17.4",
"eslint": "^8.47.0",
"@unocss/transformer-directives": "^0.55.7",
"@unocss/transformer-variant-group": "^0.55.7",
"@vitejs/plugin-vue": "^4.3.4",
"cypress": "^13.1.0",
"eslint": "^8.48.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-cypress": "^2.14.0",
"eslint-plugin-import": "^2.28.1",
Expand All @@ -44,7 +44,7 @@
"start-server-and-test": "^2.0.0",
"stylelint": "^15.10.3",
"stylelint-config-standard": "^34.0.0",
"unocss": "^0.55.2",
"unocss": "^0.55.7",
"vite-plugin-pwa": "^0.16.4",
"workbox-window": "^7.0.0"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 9 additions & 6 deletions frontend/src/components/ResultPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,24 @@ function sendFeedback (isCorrect) {
<template>
<div class="result-frame -mx-8 py-5 px-8">
<div class="result">
<h4
<h2
v-if="route.name === 'IdentificationTypologyResult' && isDummyTypology === true"
class="typology-title bg-white py-4"
>
Typologie de l'arme
</h4>
<h4
</h2>
<h2
v-else
class="typology-title bg-white py-4"
>
Résultat Final
</h4>
</h2>
<div
class="result-image"
:style="{backgroundImage:`url(${img})`}"
/>
<div class="fr-tile fr-enlarge-link mb-3">
<h4 class="fr-tile__title px-2">
<h2 class="fr-tile__title px-2">
<div v-if="confidenceLevel === 'low'">
<div class="fr-tile__body">
<DsfrTag
Expand Down Expand Up @@ -180,7 +180,8 @@ function sendFeedback (isCorrect) {
</div>
</div>
</div>
</h4>
</h2>
</h2>
</div>
<div
v-if="route.name === 'IdentificationTypologyResult' && confidenceLevel !== 'low' && resultTree[typology]?.isDummyTypology"
Expand Down Expand Up @@ -231,6 +232,8 @@ function sendFeedback (isCorrect) {
</div>
</div>
</div>
</h2>
</h2>
</div>
<div
v-if="isFeedbackDone"
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@ html {
--select-option-image-width: 13rem;
}

h1 {
font-size: 1.75rem
}

h2 {
font-size: 1.3rem
}

h3 {
font-size: 1.1rem;
color: var(--blue-france-sun-113-625)
}

#app {
position: absolute;
inset: 0;
Expand Down
78 changes: 39 additions & 39 deletions frontend/src/views/AboutPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const imgs = ref([
<template>
<div>
<div class="fr-container mt-4">
<h2>À propos</h2>
<h1>À propos</h1>
<div>
<p class="title-space">
Basegun est un projet d'application par apprentissage automatique capable
Expand Down Expand Up @@ -83,52 +83,52 @@ const imgs = ref([
</template>

<style scoped>
.content {
margin: min(5vw, 10rem);
}
.content {
margin: min(5vw, 10rem);
}
.contact-list {
margin-left: 2rem;
}
.contact-list {
margin-left: 2rem;
}
.small-text {
font-size: 10pt;
margin-bottom: 0;
}
.small-text {
font-size: 10pt;
margin-bottom: 0;
}
.small-link {
color: var(--blue-france-sun-113-625);
}
.small-link {
color: var(--blue-france-sun-113-625);
}
.small-link:hover {
color: #1212ff
}
.small-link:hover {
color: #1212ff
}
.title-space {
margin-top: 20px;
}
.title-space {
margin-top: 20px;
}
.container-img {
display: flex;
justify-content: center;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
}
.container-img {
display: flex;
justify-content: center;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
}
.img {
margin: 2em;
width: 6em;
height: auto;
}
.img {
margin: 2em;
width: 6em;
height: auto;
}
.list {
margin-left: 2em;
list-style: square;
}
.list {
margin-left: 2em;
list-style: square;
}
:deep(.fr-icon-alert-fill) {
padding-right: .1em;
}
:deep(.fr-icon-alert-fill) {
padding-right: .1em;
}
</style>
2 changes: 1 addition & 1 deletion frontend/src/views/ContactPage.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div>
<div class="fr-container mt-4">
<h2>ContactPage</h2>
<h1>Contact</h1>
<div>
<p class="title-space">
Toute question, remarque ou contribution concernant le projet Basegun est à adresser par email à <a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const goToNextStep = () => (
:steps="steps"
:current-step="currentStep"
/>
<h4 class="m-2.5">
<h2 class="m-2.5">
Mettre en sécurité mon arme
</h4>
</h2>
<RouterView />
</div>
</div>
Expand Down
29 changes: 18 additions & 11 deletions frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ const typology = computed(() => resultStore.typology)
<div class="fr-container">
<div class="result fr-col-11 fr-col-lg-6 m-auto">
<div v-if="!resultTree[typology]?.isSecuringOptions">
<h4 class="mt-5 text-center">
<h2 class="mt-5 text-center">
Pas de guide de mise en sécurité pour votre arme
</h4>
</h2>
<div
class="text-center"
Expand All @@ -24,25 +24,32 @@ const typology = computed(() => resultStore.typology)
</p>
<p>Souhaitez-vous l'identifier quand même ? <br> Sinon vous pouvez retourner au menu.</p>
</div>
<div class="fr-col-sm-6 fr-col-lg-8 mx-auto text-center">
<img
src="@/assets/guide-mise-en-securite/icones/fin-mise-en-securite-nok.jpg"
alt="alt"
class="img-deco"
>
</div>
</div>
<div v-else>
<h4 class="mt-5 text-center">
<h2 class="mt-5 text-center">
Fin de la mise en sécurité de l’arme
</h4>
</h2>
<p class="ending font-600 text-center">
Vous venez de sécuriser votre arme !
</p>
<p>
La manipulation étant terminée, vous pouvez identifier votre arme ou retourner au menu.
</p>
</div>
</div>
<div class="fr-col-sm-6 fr-col-lg-8 mx-auto text-center">
<img
src="@/assets/guide-mise-en-securite/icones/fin-mise-en-securite.jpg"
alt="alt"
class="img-deco"
>
<div class="fr-col-sm-6 fr-col-lg-8 mx-auto text-center">
<img
src="@/assets/guide-mise-en-securite/icones/fin-mise-en-securite-ok.jpg"
alt="alt"
class="img-deco"
>
</div>
</div>
</div>
<div class="footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ function updateTypology () {
<template>
<div class="fr-container">
<div class="result fr-col-11 fr-col-lg-6 mx-auto">
<h4 class="mt-3 text-center">
<h2 class="mt-3 mb-1 text-center">
Mettre en sécurité mon arme
</h4>
<h5 class="text-center my-auto">
</h2>
<h3 class="text-center my-auto">
Choix du type d'arme
</h5>
</h3>
<div class="instructions">
<p
class="leading-7 mt-3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ const zoomOn = (imgValue) => {
v-if="typology !== 'revolver'"
class="result fr-col-11 fr-col-lg-6 mx-auto"
>
<h4 class="mt-3 text-center">
<h2 class="mt-3 mb-1 text-center">
Mettre en sécurité mon arme
</h4>
<h5 class="text-center my-auto">
</h2>
<h3 class="text-center my-auto">
Choix du type d'arme
</h5>
</h3>
<div class="instructions">
<p
class="leading-7 mt-3"
Expand Down Expand Up @@ -93,12 +93,12 @@ const zoomOn = (imgValue) => {
v-else
class="result fr-col-11 fr-col-lg-6 mx-auto"
>
<h4 class="mt-3 text-center">
<h2 class="mt-3 mb-1 text-center">
Mettre en sécurité mon arme
</h4>
<h5 class="text-center my-auto">
</h2>
<h3 class="text-center my-auto">
Choix du type d'arme
</h5>
</h3>
<div class="instructions">
<p
class="leading-7 mt-3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ const stepsStore = useStepsStore()
const typology = computed(() => resultStore.typology)
const selectedOptionStep1 = computed(() => stepsStore.selectedOptionStep1)
const selectedOptionStep2 = computed(() => stepsStore.selectedOptionStep2)
const selectedOptionStep3 = computed({
get () {
return stepsStore.selectedOptionStep3
Expand All @@ -38,12 +36,12 @@ const zoomOn = (imgValue) => {
<div
class="result fr-col-11 fr-col-lg-6 mx-auto"
>
<h4 class="mt-3 text-center">
<h2 class="mt-3 mb-1 text-center">
Mettre en sécurité mon arme
</h4>
<h5 class="text-center my-auto">
</h2>
<h3 class="text-center my-auto">
Choix du type d'arme
</h5>
</h3>
<div class="instructions">
<p
class="leading-7 mt-3"
Expand Down
Loading

0 comments on commit efca365

Please sign in to comment.