From 4bf64136c58cb22aaf772f29e2cba1181e37923e Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 28 Sep 2022 13:54:52 +0200 Subject: [PATCH] wait #5489 @0.5 --- _doc/SVG/Fichier 1.svg | 2 +- _doc/SVG/Fichier 2.svg | 2 +- _doc/SVG/Fichier 3.svg | 1 + _doc/{ => _done}/Prevision-projet-1-liste..ai | 0 inc/svg-sprite.php | 2 +- js/script.js | 4 +- projections.php | 103 ++++++++++++++++++ style/inc/forms.sass | 4 +- style/inc/tags.sass | 1 - style/inc/variables.sass | 8 +- style/style.sass | 21 +++- 11 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 _doc/SVG/Fichier 3.svg rename _doc/{ => _done}/Prevision-projet-1-liste..ai (100%) create mode 100644 projections.php diff --git a/_doc/SVG/Fichier 1.svg b/_doc/SVG/Fichier 1.svg index 6fa4999..e6f9a2a 100644 --- a/_doc/SVG/Fichier 1.svg +++ b/_doc/SVG/Fichier 1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/_doc/SVG/Fichier 2.svg b/_doc/SVG/Fichier 2.svg index ecf97cb..c51d49d 100644 --- a/_doc/SVG/Fichier 2.svg +++ b/_doc/SVG/Fichier 2.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/_doc/SVG/Fichier 3.svg b/_doc/SVG/Fichier 3.svg new file mode 100644 index 0000000..df4c5d3 --- /dev/null +++ b/_doc/SVG/Fichier 3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/_doc/Prevision-projet-1-liste..ai b/_doc/_done/Prevision-projet-1-liste..ai similarity index 100% rename from _doc/Prevision-projet-1-liste..ai rename to _doc/_done/Prevision-projet-1-liste..ai diff --git a/inc/svg-sprite.php b/inc/svg-sprite.php index ee0b5c6..db8fa08 100644 --- a/inc/svg-sprite.php +++ b/inc/svg-sprite.php @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/js/script.js b/js/script.js index abe78e5..4da98e3 100644 --- a/js/script.js +++ b/js/script.js @@ -23,11 +23,11 @@ $(function () { $("[data-icon]").each(function () { var iconId = 'eif-' + $(this).data('icon'); // L'icône est déjà en place - if ($(this).find('svg.' + iconId).length) { + if ($(this).children('svg.' + iconId).length) { return; } // Si une autre icône est présente, on la supprime - $(this).find('svg.svg-icon').remove(); + $(this).children('svg.svg-icon').remove(); // Puis on ajoute l'icône var icon = getSpriteIcon(iconId); if ($(this).is('[data-icon-prepend]')) { diff --git a/projections.php b/projections.php new file mode 100644 index 0000000..0567d35 --- /dev/null +++ b/projections.php @@ -0,0 +1,103 @@ + +
+ + + + + + + + + + Rechercher + Réinitialiser les filtres +
+
+
+
+ + +
+

Projections

+
Exporter
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LibelléAnnée NAnnée N+1Année N+2Année N+3
Propriétaire(s): ESPACE COMMERCE EUROPE1 044 111 €1 044 111 €1 070 000 €1 060 000 €
Propriétaire(s): ESPACE COMMERCE EUROPE1 044 111 €1 044 111 €1 070 000 €1 060 000 €
Propriétaire(s): ESPACE COMMERCE EUROPE1 044 111 €1 044 111 €1 070 000 €1 060 000 €
Propriétaire(s): ESPACE COMMERCE EUROPE1 044 111 €1 044 111 €1 070 000 €1 060 000 €
+ +
+ \ No newline at end of file diff --git a/style/inc/forms.sass b/style/inc/forms.sass index 933a757..2245e69 100644 --- a/style/inc/forms.sass +++ b/style/inc/forms.sass @@ -5,7 +5,7 @@ form display: inline-block vertical-align: bottom position: relative - margin-right: 15px + margin: 0 15px 30px 0 span color: $input-text-color @@ -39,7 +39,7 @@ form .submit display: inline-block - vertical-align: bottom + vertical-align: top background-color: $button-color color: #fff cursor: pointer diff --git a/style/inc/tags.sass b/style/inc/tags.sass index 2760cec..dfa202b 100644 --- a/style/inc/tags.sass +++ b/style/inc/tags.sass @@ -1,6 +1,5 @@ .tag color: #fff - border-radius: 3px width: 180px text-align: center padding: 5px 0 diff --git a/style/inc/variables.sass b/style/inc/variables.sass index e158cc5..2a502da 100644 --- a/style/inc/variables.sass +++ b/style/inc/variables.sass @@ -3,7 +3,7 @@ $background-color: #F0EDEB $menu-background: #363636 $thead-background: #363636 -$table-odd-background:#F0EDEB +$table-odd-background: rgba(240, 237, 235, 0.5) $table-selected-background: #F9CABB $table-odd-selected-background: #F9CABB @@ -12,10 +12,14 @@ $cancel-color: #D6231A $button-color: #c1ce3a $input-text-color: #454565 $headings-color: #454565 -$light-color:#a2a1bc +$light-color: #a2a1bc $space: 25px $tag-green: #c1ce3a $tag-yellow: #F7D000 $tag-orange: #f07800 $tag-red: #d6231a + +$evolution-stable: #BCBDC0 +$evolution-asc: #D6231A +$evolution-desc: #C1CE3A \ No newline at end of file diff --git a/style/style.sass b/style/style.sass index 9a0bc58..d0933b8 100644 --- a/style/style.sass +++ b/style/style.sass @@ -31,13 +31,11 @@ main margin-top: 15px padding: 15px 0 - &.table border-radius: 6px background-color: #fff padding: $space - header, footer position: relative height: 40px @@ -94,7 +92,7 @@ main &.eif-order height: 12px - color: rgba(255,255,255,0.25) + color: rgba(255, 255, 255, 0.25) &.eif-order-asc vertical-align: top @@ -127,6 +125,23 @@ main td background-color: $table-odd-selected-background + .svg-icon[class^=eif-evolution-] + position: relative + top: 2px + margin-left: 5px + + .svg-icon.eif-evolution-stable + color: $evolution-stable + height: 14px + + .svg-icon.eif-evolution-asc + color: $evolution-asc + height: 16px + + .svg-icon.eif-evolution-desc + color: $evolution-desc + height: 16px + h2 color: $headings-color -- 2.39.5