From 0cb910f38a72756f9f9a1bc593247802d1764854 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Mon, 23 Apr 2018 17:22:20 +0200 Subject: [PATCH] Style: extract and rename accompagnateur-header to sub-header --- .../stylesheets/new_design/accompagnateur.scss | 11 ----------- app/assets/stylesheets/new_design/print.scss | 2 +- app/assets/stylesheets/new_design/sub_header.scss | 13 +++++++++++++ .../new_administrateur/procedures/apercu.html.haml | 2 +- app/views/new_gestionnaire/avis/_header.html.haml | 2 +- app/views/new_gestionnaire/avis/index.html.haml | 2 +- .../new_gestionnaire/dossiers/_header.html.haml | 2 +- .../new_gestionnaire/procedures/show.html.haml | 2 +- app/views/new_user/dossiers/index.html.haml | 2 +- app/views/root/patron.html.haml | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 app/assets/stylesheets/new_design/sub_header.scss diff --git a/app/assets/stylesheets/new_design/accompagnateur.scss b/app/assets/stylesheets/new_design/accompagnateur.scss index d5538c10b..c70e0da35 100644 --- a/app/assets/stylesheets/new_design/accompagnateur.scss +++ b/app/assets/stylesheets/new_design/accompagnateur.scss @@ -19,17 +19,6 @@ margin-bottom: 2 * $default-padding; } -.accompagnateur-header { - background-color: $light-grey; - padding-top: $default-padding; - margin-bottom: 3 * $default-spacer; - border-bottom: 1px solid $border-grey; - - .container { - margin-bottom: -1px; - } -} - .mixed-buttons-bar { flex-shrink: 0; diff --git a/app/assets/stylesheets/new_design/print.scss b/app/assets/stylesheets/new_design/print.scss index 71c4bbe4c..0a62ad243 100644 --- a/app/assets/stylesheets/new_design/print.scss +++ b/app/assets/stylesheets/new_design/print.scss @@ -2,7 +2,7 @@ @import "fonts"; .new-header, -.accompagnateur-header, +.sub-header, footer { display: none; } diff --git a/app/assets/stylesheets/new_design/sub_header.scss b/app/assets/stylesheets/new_design/sub_header.scss new file mode 100644 index 000000000..84121b6dd --- /dev/null +++ b/app/assets/stylesheets/new_design/sub_header.scss @@ -0,0 +1,13 @@ +@import "colors"; +@import "constants"; + +.sub-header { + background-color: $light-grey; + padding-top: $default-padding; + margin-bottom: 3 * $default-spacer; + border-bottom: 1px solid $border-grey; + + .container { + margin-bottom: -1px; + } +} diff --git a/app/views/new_administrateur/procedures/apercu.html.haml b/app/views/new_administrateur/procedures/apercu.html.haml index b5a8dcc4d..5e9d1732d 100644 --- a/app/views/new_administrateur/procedures/apercu.html.haml +++ b/app/views/new_administrateur/procedures/apercu.html.haml @@ -1,4 +1,4 @@ -.dossiers-headers.accompagnateur-header +.dossiers-headers.sub-header .container %h1.page-title Prévisualisation de la procédure #{@dossier.procedure.libelle} diff --git a/app/views/new_gestionnaire/avis/_header.html.haml b/app/views/new_gestionnaire/avis/_header.html.haml index aac10ae17..38bfab5b3 100644 --- a/app/views/new_gestionnaire/avis/_header.html.haml +++ b/app/views/new_gestionnaire/avis/_header.html.haml @@ -1,4 +1,4 @@ -.accompagnateur-header +.sub-header .container %ul.breadcrumbs %li= link_to('Avis', gestionnaire_avis_index_path) diff --git a/app/views/new_gestionnaire/avis/index.html.haml b/app/views/new_gestionnaire/avis/index.html.haml index 2a7c6c0a3..d62c1fd69 100644 --- a/app/views/new_gestionnaire/avis/index.html.haml +++ b/app/views/new_gestionnaire/avis/index.html.haml @@ -1,7 +1,7 @@ - avis_statut = (@statut == NewGestionnaire::AvisController::A_DONNER_STATUS) ? 'à donner' : 'rendus' - content_for(:title, "Avis #{avis_statut}") -.accompagnateur-header +.sub-header .container.flex .width-100 %h1.tab-title Avis diff --git a/app/views/new_gestionnaire/dossiers/_header.html.haml b/app/views/new_gestionnaire/dossiers/_header.html.haml index d54b07596..e30b6d7cd 100644 --- a/app/views/new_gestionnaire/dossiers/_header.html.haml +++ b/app/views/new_gestionnaire/dossiers/_header.html.haml @@ -1,4 +1,4 @@ -.accompagnateur-header +.sub-header .container .flex.justify-between %ul.breadcrumbs diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index e8a25a443..3425f5ac8 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -1,7 +1,7 @@ - content_for(:title, "#{@procedure.libelle}") #procedure-show - .accompagnateur-header + .sub-header .container.flex .procedure-logo{ style: @procedure.logo.present? ? "background-image: url(#{@procedure.logo.url})" : nil, diff --git a/app/views/new_user/dossiers/index.html.haml b/app/views/new_user/dossiers/index.html.haml index 5c7bf13cc..cd6779443 100644 --- a/app/views/new_user/dossiers/index.html.haml +++ b/app/views/new_user/dossiers/index.html.haml @@ -1,4 +1,4 @@ -.dossiers-headers.accompagnateur-header +.dossiers-headers.sub-header .container %h1.page-title Les dossiers diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml index 21ef9951e..c6802ab98 100644 --- a/app/views/root/patron.html.haml +++ b/app/views/root/patron.html.haml @@ -131,7 +131,7 @@ %td Table Data 3 %h1 Header - .accompagnateur-header + .sub-header .container Titre %ul.tabs