diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb index 41569e5..62acdb8 100644 --- a/app/views/templates/_show_phases_sections.html.erb +++ b/app/views/templates/_show_phases_sections.html.erb @@ -2,23 +2,23 @@

<%= phase.title %>

-
+

<%= raw phase.description %>

-
+
- <% if phase_hash[:sections].length > 0 %> - <%= link_to _('Preview'), admin_preview_phase_path(id: phase.id), class: 'btn btn-primary'%> + <%= link_to _('Preview'), admin_preview_phase_path(id: phase.id), class: "link-as-button" %> <% end %> + <% if template == current && phase.modifiable %> <%= link_to _('Delete'), admin_destroy_phase_path(phase_id: phase.id), - confirm: _("You are about to delete '%{phase_title}'. This will affect versions, sections and questions linked to this phase. Are you sure?") % { :phase_title => phase.title }, method: :delete, class: "btn btn-primary"%> + confirm: _("You are about to delete '%{phase_title}'. This will affect versions, sections and questions linked to this phase. Are you sure?") % {phase_title: phase.title}, method: :delete, class: "link-as-button" %> <% b_label = _('Edit phase')%> <% else %> <% b_label = _('View phase')%> <% end %> - <%= link_to b_label, admin_show_phase_path(id: phase.id, edit: (b_label == _('Edit phase'))), class: "btn btn-primary" %> + <%= link_to b_label, admin_show_phase_path(id: phase.id, edit: (b_label == _('Edit phase'))), class: "link-as-button" %>
<% if phase_hash[:sections].present? %> diff --git a/lib/assets/stylesheets/dmproadmap/accordions.scss b/lib/assets/stylesheets/dmproadmap/accordions.scss index 7f1834c..086be4b 100644 --- a/lib/assets/stylesheets/dmproadmap/accordions.scss +++ b/lib/assets/stylesheets/dmproadmap/accordions.scss @@ -26,6 +26,7 @@ } div.accordion-section { + position: relative; background-color: white; } } \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss index 7b23471..64a05c1 100644 --- a/lib/assets/stylesheets/dmproadmap/base.scss +++ b/lib/assets/stylesheets/dmproadmap/base.scss @@ -41,7 +41,7 @@ .right { position: absolute; - top: 5px; + top: 15px; right: 10px; } @@ -231,7 +231,8 @@ } .header-org-banner-text { width: 60%; - vertical-align: top; + vertical-align: bottom; + margin-left: 25px; } } .main-nav {