diff --git a/resources/js/components/Evaluations/Single/Components/MeasureLevelCircle.vue b/resources/js/components/Evaluations/Single/Components/MeasureLevelCircle.vue
index a064dc5376ae68325c14b268592e0637d8f6a2c5..5d981be490751331356dff6e528122b2f44bddf0 100644
--- a/resources/js/components/Evaluations/Single/Components/MeasureLevelCircle.vue
+++ b/resources/js/components/Evaluations/Single/Components/MeasureLevelCircle.vue
@@ -11,13 +11,13 @@
</span>
</p>
<div v-if="isResult && level === 3">
- <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="green" viewBox="0 0 16 16">
+ <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="#468355" viewBox="0 0 16 16">
<path d="m8 1.288 6.842 5.56L12.267 15H3.733L1.158 6.847 8 1.288zM16 6.5 8 0 0 6.5 3 16h10l3-9.5z"/>
</svg>
<svg
xmlns="http://www.w3.org/2000/svg" width="110"
- height="110" fill="green"
+ height="110" fill="#468355"
viewBox="0 0 16 16"
style="top: 23px">
<path d="m8 0 8 6.5-3 9.5H3L0 6.5 8 0z"/>
@@ -92,13 +92,13 @@ export default {
color () {
switch (this.level) {
case 0:
- return 'black'
+ return '#454545' //black
case 1:
- return 'red'
+ return '#D63F49' // red
case 2:
- return '#09759B'
+ return '#FFC107' // warning
case 3:
- return 'green'
+ return '#468355' // green
default:
return 'transparent'
}
@@ -106,13 +106,13 @@ export default {
expectedColor () {
switch (this.expectedLevel) {
case 0:
- return 'black'
+ return '#454545'
case 1:
- return 'red'
+ return '#D63F49'
case 2:
- return '#09759B'
+ return '#FFC107'
case 3:
- return 'green'
+ return '#468355'
default:
return 'transparent'
}
diff --git a/resources/js/components/Evaluations/Single/Components/Results/MaturityCyber.vue b/resources/js/components/Evaluations/Single/Components/Results/MaturityCyber.vue
index bdb0e5fcad5eab211fac0491d167625ba74e0dd8..9794b6049e50f6f3738aac60b1d853282438258a 100644
--- a/resources/js/components/Evaluations/Single/Components/Results/MaturityCyber.vue
+++ b/resources/js/components/Evaluations/Single/Components/Results/MaturityCyber.vue
@@ -1,5 +1,5 @@
<template>
- <div class="card card-info">
+ <div class="card card-warning">
<div class="card-header py-1">
<div class="card-title">
Indice de maturité cyber
diff --git a/resources/js/components/Evaluations/Single/Components/Results/PlanAction.vue b/resources/js/components/Evaluations/Single/Components/Results/PlanAction.vue
index 874cd3c1df9324a9cf86a04a35cc13a15ae4141e..276f19b98602acb9865c978709265b765a3b733f 100644
--- a/resources/js/components/Evaluations/Single/Components/Results/PlanAction.vue
+++ b/resources/js/components/Evaluations/Single/Components/Results/PlanAction.vue
@@ -1,5 +1,5 @@
<template>
- <div class="card card-secondary mt-4">
+ <div class="card card-danger mt-4">
<div class="card-header py-1">
<div class="card-title">
Plan d'action
diff --git a/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelChooser.vue b/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelChooser.vue
index dc8c75b31ef78b42ce6ce4f87c5f70b579a3dc2e..d83a9624197249179e54c487723aa422ed160244 100644
--- a/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelChooser.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelChooser.vue
@@ -13,28 +13,28 @@
<MeasureLevelSelector
:measure="measure" :level="0"
:level-selected="levelSelected" :is-editable="isEditable"
- color="black"
+ color="#454545"
@setLevel="setLevel($event)"/>
</div>
<div class="col-xl-3 col-md-6">
<MeasureLevelSelector
:measure="measure" :level="1"
:level-selected="levelSelected" :is-editable="isEditable"
- color="red"
+ color="#D63F49"
@setLevel="setLevel($event)"/>
</div>
<div class="col-xl-3 col-md-6">
<MeasureLevelSelector
:measure="measure" :level="2"
:level-selected="levelSelected" :is-editable="isEditable"
- color="#09759B"
+ color="#427D9F"
@setLevel="setLevel($event)"/>
</div>
<div class="col-xl-3 col-md-6">
<MeasureLevelSelector
:measure="measure" :level="3"
:level-selected="levelSelected" :is-editable="isEditable"
- color="green"
+ color="#468355"
@setLevel="setLevel($event)"/>
</div>
</div>
diff --git a/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelSelector.vue b/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelSelector.vue
index af9e5ed9e27155e3ed37134a4e87fb40ea5884d7..e5b1afff2718a6efc3966c7899c89b933d8e3d6b 100644
--- a/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelSelector.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelSelector.vue
@@ -28,13 +28,13 @@ export default {
color () {
switch (this.level) {
case 0:
- return 'black'
+ return '#454545' // black
case 1:
- return 'red'
+ return '#D63F49' // red
case 2:
- return '#09759B'
+ return '#FFC107' // yellow
case 3:
- return 'green'
+ return '#468355' // green
default:
return 'transparent'
}
diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
index e323389e52e7bea72e15cc5fdf000df7efbf7139..aaad5f3b234017ffbf342157391e4ba0e1449e70 100644
--- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
@@ -61,13 +61,13 @@ export default {
expectedColor () {
switch (this.measureLevel.expected_level) {
case 0:
- return 'black'
+ return '#454545' // black
case 1:
- return 'red'
+ return '#D63F49' // red
case 2:
- return '#09759B'
+ return '#FFC107' // yellow
case 3:
- return 'green'
+ return '#468355' // green
default:
return 'transparent'
}
diff --git a/resources/js/components/Evaluations/Single/View/index.vue b/resources/js/components/Evaluations/Single/View/index.vue
index a1ad8d3085eb5f0c3a1967c1931d447ccb25835f..fc5f65cf6c564c58d691aeef10e06dc777cc6f9f 100644
--- a/resources/js/components/Evaluations/Single/View/index.vue
+++ b/resources/js/components/Evaluations/Single/View/index.vue
@@ -20,7 +20,7 @@
<Dangers :evaluation="evaluation" />
<Measures :evaluation="evaluation" />
<div class="card">
- <div class="card-header py-1 bg-purple">
+ <div class="card-header py-1 bg-warning">
<div class="card-title">
Vraisemblance de réussite des scénarios d'attaque
</div>
@@ -32,8 +32,8 @@
<PlanAction :evaluation="evaluation" />
</div>
<div class="col-md-6">
- <div class="card card-success">
- <div class="card-header py-1">
+ <div class="card">
+ <div class="card-header py-1 bg-grey text-white">
<div class="card-title">
Niveau d'exposition au risque cyber
</div>
diff --git a/resources/js/components/Measures/Single/index.vue b/resources/js/components/Measures/Single/index.vue
index 93a8974052530a5924e4f670b432d2eb62d298c6..fe2efdf0a91b1091479f0df95e4621c34ff3523e 100644
--- a/resources/js/components/Measures/Single/index.vue
+++ b/resources/js/components/Measures/Single/index.vue
@@ -40,7 +40,7 @@
title="Niveau 2"
:level="measure.levels[2]"
:submitted="submitted"
- bg="bg-info"
+ bg="bg-warning"
/>
<LevelBlock
ref="Level3"
diff --git a/resources/js/components/Organizations/List.vue b/resources/js/components/Organizations/List.vue
index 28ba17aad3033e8fc026e250482e30a84dd39de5..e3c8be217290c8dbe20e2849872df105bcc0f1fa 100644
--- a/resources/js/components/Organizations/List.vue
+++ b/resources/js/components/Organizations/List.vue
@@ -48,7 +48,7 @@
<span v-if="props.row.active" class="badge badge-success">
Actif
</span>
- <span v-else class="badge badge-secondary">
+ <span v-else class="badge badge-grey bg-grey">
Inactif
</span>
</div>
diff --git a/resources/js/components/Users/List.vue b/resources/js/components/Users/List.vue
index 36fe90b90869543fc8b5f09eead31065a0730ec4..5db76ca2886bf3bb7e74151d006262f5ffab7d47 100644
--- a/resources/js/components/Users/List.vue
+++ b/resources/js/components/Users/List.vue
@@ -81,7 +81,7 @@
</span>
<span
v-else
- class="badge badge-secondary"
+ class="badge badge-grey bg-grey"
>
Inactif
</span>
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
index cfa796726fb5ecfcbf2462257b328ef3765ad1ae..79416b4d121d9df9fff0ecd6e906a99df14bee91 100644
--- a/resources/sass/_variables.scss
+++ b/resources/sass/_variables.scss
@@ -16,8 +16,9 @@ $sidebar-padding-x: .5rem;
$primary: #28285B;
$secondary: #D7D7DF;
-$success: #147616;
-$info: #4281A4;
-$danger: #D50000;
+$success: #468355;
+$info: #427D9F;
+$danger: #D63F49;
+$warning: #FFC107;
$light: #F4F4F4;
-$dark: #2A2A22;
+$dark: #454545;
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index e25d0ae440bdaeb49b89bf0c63c2ce221f6c7f95..4d4afb5b1ffa1aa287c20a016d431e4a116e6845 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -10,6 +10,10 @@
@import '~admin-lte/build/scss/adminlte';
+.bg-grey {
+ background-color : #454545!important;
+}
+
@media (min-width: 1700px) {
.modal-xl {
max-width: 80%;
diff --git a/resources/views/pdf/dossierCyberSecurite/measure_circle.blade.php b/resources/views/pdf/dossierCyberSecurite/measure_circle.blade.php
index 66c6f89c38ebebee63433970279f2c5d5e7ebd79..4fe423e6bc316880e14741c763c3657dcb666f23 100644
--- a/resources/views/pdf/dossierCyberSecurite/measure_circle.blade.php
+++ b/resources/views/pdf/dossierCyberSecurite/measure_circle.blade.php
@@ -14,31 +14,31 @@ function getProgressFromLevel ($level)
$actualColor = 'transparent';
switch ($action->actual_level) {
case 0:
- $actualColor = 'black';
+ $actualColor = '#454545';
break;
case 1:
- $actualColor = 'red';
+ $actualColor = '#D63F49';
break;
case 2:
- $actualColor = '#4281A4';
+ $actualColor = '#FFC107';
break;
case 3:
- $actualColor = 'green';
+ $actualColor = '#468355';
break;
}
$expectedColor = 'transparent';
switch ($action->expected_level) {
case 0:
- $expectedColor = 'black';
+ $expectedColor = '#454545';
break;
case 1:
- $expectedColor = 'red';
+ $expectedColor = '#D63F49';
break;
case 2:
- $expectedColor = '#4281A4';
+ $expectedColor = '#FFC107';
break;
case 3:
- $expectedColor = 'green';
+ $expectedColor = '#468355';
break;
}
$expectedDashOffset = (new \App\Helpers\SVG(getProgressFromLevel($action->expected_level), 100))->dashArray();
@@ -58,13 +58,13 @@ function getProgressFromLevel ($level)
@if($action->actual_level === 3)
{{-- Show crown for level 3--}}
<div style="position: relative">
- <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="green" viewBox="0 0 16 16">
+ <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="#468355" viewBox="0 0 16 16">
<path d="m8 1.288 6.842 5.56L12.267 15H3.733L1.158 6.847 8 1.288zM16 6.5 8 0 0 6.5 3 16h10l3-9.5z"/>
</svg>
<svg
xmlns="http://www.w3.org/2000/svg" width="110"
- height="110" fill="green"
+ height="110" fill="#468355"
viewBox="0 0 16 16"
style="top: 23px">
<path d="m8 0 8 6.5-3 9.5H3L0 6.5 8 0z"/>
diff --git a/resources/views/pdf/planAction/measure_circle.blade.php b/resources/views/pdf/planAction/measure_circle.blade.php
index 2965d708ac0f1e2c7dad2b46a3c0c608c3de34b5..a04a7a442dea2153a1283da0c01d7dbf53c8bede 100644
--- a/resources/views/pdf/planAction/measure_circle.blade.php
+++ b/resources/views/pdf/planAction/measure_circle.blade.php
@@ -14,31 +14,31 @@ function getProgressFromLevel ($level)
$actualColor = 'transparent';
switch ($action->actual_level) {
case 0:
- $actualColor = 'black';
+ $actualColor = '#454545';
break;
case 1:
- $actualColor = 'red';
+ $actualColor = '#D63F49';
break;
case 2:
- $actualColor = '#4281A4';
+ $actualColor = '#FFC107';
break;
case 3:
- $actualColor = 'green';
+ $actualColor = '#468355';
break;
}
$expectedColor = 'transparent';
switch ($action->expected_level) {
case 0:
- $expectedColor = 'black';
+ $expectedColor = '#454545';
break;
case 1:
- $expectedColor = 'red';
+ $expectedColor = '#D63F49';
break;
case 2:
- $expectedColor = '#4281A4';
+ $expectedColor = '#FFC107';
break;
case 3:
- $expectedColor = 'green';
+ $expectedColor = '#468355';
break;
}
$expectedDashOffset = (new \App\Helpers\SVG(getProgressFromLevel($action->expected_level), 100))->dashArray();
@@ -65,13 +65,13 @@ function getProgressFromLevel ($level)
@if($action->actual_level === 3)
{{-- Show crown for level 3--}}
<div style="position: relative">
- <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="green" viewBox="0 0 16 16">
+ <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="#468355" viewBox="0 0 16 16">
<path d="m8 1.288 6.842 5.56L12.267 15H3.733L1.158 6.847 8 1.288zM16 6.5 8 0 0 6.5 3 16h10l3-9.5z"/>
</svg>
<svg
xmlns="http://www.w3.org/2000/svg" width="110"
- height="110" fill="green"
+ height="110" fill="#468355"
viewBox="0 0 16 16"
style="top: 23px">
<path d="m8 0 8 6.5-3 9.5H3L0 6.5 8 0z"/>