diff --git a/app/assets/stylesheets/responsive/_global_layout.scss b/app/assets/stylesheets/responsive/_global_layout.scss index 0c83e9b8ca..2b19a24b64 100644 --- a/app/assets/stylesheets/responsive/_global_layout.scss +++ b/app/assets/stylesheets/responsive/_global_layout.scss @@ -179,7 +179,9 @@ textarea{ margin-right: 0; } - +.action-bar__follower-count { + font-size: 0.875em; +} /* * Drop-down style action button @@ -261,7 +263,7 @@ textarea{ display: none; list-style: none; - margin: 10px 0 0 0; + margin: 10px 0 60px 0; min-width: 100%; @include respond-min( 20em ){ min-width: 280px; diff --git a/app/assets/stylesheets/responsive/_request_layout.scss b/app/assets/stylesheets/responsive/_request_layout.scss index b096b22afb..6694666c80 100644 --- a/app/assets/stylesheets/responsive/_request_layout.scss +++ b/app/assets/stylesheets/responsive/_request_layout.scss @@ -84,7 +84,6 @@ margin-bottom: 0.5em; margin-right: 1em; @include respond-min( $main_menu-mobile_menu_cutoff ){ - text-align: center; margin-bottom: 0; } } @@ -108,10 +107,6 @@ .action-bar__follower-count { margin: 0; } - - .action-bar__follower-count { - font-size: 0.875em; - } } .request-header__action-bar__actions--narrow { @@ -265,6 +260,23 @@ a.track-request-action { display: inline-block; } +/* Request correspondence footer action menu */ +.request-footer__action-bar__actions { + @include grid-column(12, $collapse:true); + @media (min-width: 30em) { + justify-content: flex-start; + @include flexbox(); + align-items: stretch; + } + + float: none; + + .after-actions { + .action-menu__button { + margin-right: 1em; + } + } +} /* Event history details */ #request_details { diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb index 6a27a62148..a1bf28c7b9 100644 --- a/app/views/public_body/show.html.erb +++ b/app/views/public_body/show.html.erb @@ -54,30 +54,31 @@ :count => @number_of_visible_requests) %> <% end %> - -
-
- <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> - <%= link_to _("Make a request to this authority"), new_request_to_body_path(:url_name => @public_body.url_name), :class => "link_button_green make-request__action" %> - <% end %> -
- -
- diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 6406775415..b9c5678851 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -11,7 +11,7 @@ load "util.rb" # Application version -ALAVETELI_VERSION = '0.26.0.0' +ALAVETELI_VERSION = '0.26.0.1' # Add new inflection rules using the following format # (all these examples are active by default): diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 4b5b43df75..5403f78139 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -6,6 +6,25 @@ ### Changed Templates +# 0.26.0.1 + +## Highlighted Features + +* Minor tweaks to unify the action bars used on the authority and request pages + (Martin Wright) +* Added the new action menu to the bottom of the correspondence thread after + user feedback (Gareth Rees) + +## Upgrade Notes + +* This hotfix just makes a couple of template and style tweaks. You may need to + update styles for the authority and request page action bars. + +### Changed Templates + + app/views/admin_public_body/edit.html.erb + app/views/widgets/show.html.erb + # 0.26.0.0 ## Highlighted Features diff --git a/spec/integration/download_request_spec.rb b/spec/integration/download_request_spec.rb index 92b235c410..6930055ea8 100644 --- a/spec/integration/download_request_spec.rb +++ b/spec/integration/download_request_spec.rb @@ -11,7 +11,9 @@ def inspect_zip_download(session, info_request) using_session(session) do visit show_request_path(info_request) - find_link('Download a zip file of all correspondence').click + within('.request-header__action-bar') do + find_link('Download a zip file of all correspondence').click + end Tempfile.open('download') do |f| f.binmode