diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index d37c1d14b..3df5ac3c1 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -23,27 +23,6 @@ &.light { background: #ecf0f1; } - - h1, - p { - color: $text; - } -} - -.jumboAlt { - background: $highlight; - margin-bottom: $line-height; - margin-top: rem-calc(-24); - padding-bottom: $line-height; - padding-top: $line-height; - - @include breakpoint(medium) { - padding: rem-calc(24) 0; - } - - &.light { - background: #ecf0f1; - } } .lead { diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb index 413dc3515..a39e9784d 100644 --- a/app/helpers/legislation_helper.rb +++ b/app/helpers/legislation_helper.rb @@ -37,4 +37,8 @@ module LegislationHelper "milestones" => admin_legislation_process_milestones_path(process) } end + + def banner_color? + @process.background_color.present? && @process.font_color.present? + end end diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb index dd21b36ee..607fb9cbf 100644 --- a/app/views/legislation/processes/_header.html.erb +++ b/app/views/legislation/processes/_header.html.erb @@ -1,15 +1,13 @@ -
- class="legislation-hero jumboAlt" style="background:<%= process.background_color %>; color:<%= process.font_color %>;" - <% else %> - class="legislation-hero jumbo" +
+ style="background:<%= process.background_color %>; color:<%= process.font_color %>;" <% end %>>
- <% if process.background_color.present? && process.font_color.present? %> - <%= link_to content_tag(:span, nil, class: "icon-angle-left", - style: "color:#{process.font_color};") + t("shared.back"), - legislation_processes_path, class: 'back', style: 'color:#FFFFFF !important;'%> + <% if banner_color? %> + <%= link_to t("shared.back"), legislation_processes_path, + class: "icon-angle-left", + style: "color:#{process.font_color};" %> <% else %> <%= back_link_to legislation_processes_path %> <% end %> diff --git a/app/views/legislation/processes/_header_full.html.erb b/app/views/legislation/processes/_header_full.html.erb index 354140f03..6af30975c 100644 --- a/app/views/legislation/processes/_header_full.html.erb +++ b/app/views/legislation/processes/_header_full.html.erb @@ -10,8 +10,8 @@ <%= markdown @process.additional_info if @process.additional_info %>
- + style="background:<%= process.font_color %>; color:<%= process.background_color %>;" <% end %>> <%= t("legislation.processes.header.additional_info") %>