diff --git a/app/assets/images/vague.svg b/app/assets/images/vague.svg index 8e894894a..d5356a2c9 100644 --- a/app/assets/images/vague.svg +++ b/app/assets/images/vague.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/app/assets/stylesheets/active_admin.scss b/app/assets/stylesheets/active_admin.scss index 8ea1b8023..d0e35a55d 100644 --- a/app/assets/stylesheets/active_admin.scss +++ b/app/assets/stylesheets/active_admin.scss @@ -5,6 +5,7 @@ @import 'active_admin/mixins'; @import 'activeadmin_reorderable'; @import 'admin/base'; +@import 'admin/bg'; @import 'admin/fonts'; @import 'admin/mixins'; @import 'admin/typography'; diff --git a/app/assets/stylesheets/admin/_base.scss b/app/assets/stylesheets/admin/_base.scss index 6a23ebc57..652855bc7 100644 --- a/app/assets/stylesheets/admin/_base.scss +++ b/app/assets/stylesheets/admin/_base.scss @@ -35,27 +35,3 @@ @import "active_admin/structure/footer"; @import "active_admin/structure/main_structure"; @import "active_admin/structure/title_bar"; - -.bg-erreur { - color: $error-425; - background-color: $error-950; - a, h4 { - color: $error-425; - } -} - -.bg-alerte { - color: $warning-425; - background-color: $warning-950; - a, h4 { - color: $warning-425; - } -} - -.bg-information { - color: $info-425; - background-color: $info-950; - a, h4 { - color: $info-425; - } -} diff --git a/app/assets/stylesheets/admin/_bg.scss b/app/assets/stylesheets/admin/_bg.scss new file mode 100644 index 000000000..3e09fab55 --- /dev/null +++ b/app/assets/stylesheets/admin/_bg.scss @@ -0,0 +1,23 @@ +.bg-erreur { + color: $error-425; + background-color: $error-950; + a, h4 { + color: $error-425; + } +} + +.bg-alerte { + color: $warning-425; + background-color: $warning-950; + a, h4 { + color: $warning-425; + } +} + +.bg-information { + color: $info-425; + background-color: $info-950; + a, h4 { + color: $info-425; + } +} diff --git a/app/assets/stylesheets/admin/composants/_lettrisme.scss b/app/assets/stylesheets/admin/composants/_lettrisme.scss index 5937c4fd2..1d34916a8 100644 --- a/app/assets/stylesheets/admin/composants/_lettrisme.scss +++ b/app/assets/stylesheets/admin/composants/_lettrisme.scss @@ -12,8 +12,6 @@ } #lettrisme { - color: $eva-dark; - .panel { margin-bottom: 0px; p { diff --git a/app/assets/stylesheets/admin/pages/restitution_globale/_base.scss b/app/assets/stylesheets/admin/pages/restitution_globale/_base.scss index fb37ccb1a..6065db5d3 100644 --- a/app/assets/stylesheets/admin/pages/restitution_globale/_base.scss +++ b/app/assets/stylesheets/admin/pages/restitution_globale/_base.scss @@ -1,6 +1,3 @@ -@import "admin/variables"; -@import "admin/mixins"; - .evaluation__restitution-globale { font-size: 0.875rem; font-family: $font-texte; diff --git a/app/assets/stylesheets/admin/pages/restitution_globale/restitution_globale_pdf.scss b/app/assets/stylesheets/admin/pages/restitution_globale/restitution_globale_pdf.scss index 5619a4b12..8c20c5bfa 100644 --- a/app/assets/stylesheets/admin/pages/restitution_globale/restitution_globale_pdf.scss +++ b/app/assets/stylesheets/admin/pages/restitution_globale/restitution_globale_pdf.scss @@ -1,7 +1,10 @@ $grid-columns: 8; $grid-gutter-width: 1.25rem; @import "bootstrap"; +@import "../../../admin/variables"; +@import "../../../admin/mixins"; @import "base"; +@import "../../../admin/bg"; @import "../../../admin/composants/lettrisme"; @import "../../../admin/composants/referentiel_anlci"; @import "../../../pdf/base"; @@ -86,9 +89,10 @@ $grid-gutter-width: 1.25rem; text-align: center; font-size: 1rem; line-height: 2.5rem; + + a { color: $eva_light } } - a { color: $eva_light } } .autopositionnement { diff --git a/config/locales/views/evaluations.yml b/config/locales/views/evaluations.yml index e426204f8..f2f1abf2e 100644 --- a/config/locales/views/evaluations.yml +++ b/config/locales/views/evaluations.yml @@ -425,7 +425,7 @@ fr: explications-anlci: | Les restitutions eva sont basées sur les référentiels de l'Agence Nationale de Lutte Contre l'Illettrisme d'évaluation du français et des mathématiques. explications-lien: | - Le détail de l’utilisation de ces référentiels et des conditions d’interprétation est disponible ici : + Le détail de l’utilisation de ces référentiels et des conditions d’interprétation est disponible ici : https://l.incubateur.net/eva-referentiel/ anlci: titre: "Correspondance avec l’ANLCI"