Merge pull request #210 from moneyadviceservice/ie_11_fixen

IE 11 fixen (merge to master)
moneyadviceservice · Oct 9, 2015 · 0903025 · 0903025
2 parents 87de492 + 2c59fc2
commit 0903025
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 45 deletions.
diff --git a/app/assets/stylesheets/_temp_overrides.scss b/app/assets/stylesheets/_temp_overrides.scss
@@ -3,7 +3,3 @@
 .button--compact {
   min-width: 80px;
 }
-
-.pagination__counter {
-  margin: 0 $baseline-unit;
-}
diff --git a/app/assets/stylesheets/components/_further_info.scss b/app/assets/stylesheets/components/_further_info.scss
@@ -13,6 +13,7 @@
   @include body(14, 24);
   border-left: 5px solid $further-info-border-color;
   padding-left: $baseline-unit*2;
+  padding-right: $baseline-unit*2;
   margin-left: $baseline-unit*4;
   margin-bottom: $baseline-unit*6;
 }
@@ -34,6 +35,10 @@
     &:focus {
       outline: 1px dotted;
     }
+
+    &:focus, &:hover {
+      text-decoration: none;
+    }
   }
 }
 

diff --git a/app/assets/stylesheets/components/_pagination.scss b/app/assets/stylesheets/components/_pagination.scss
@@ -2,6 +2,14 @@
   color: $pagination-text-color;
 }
 
+.pagination__button--prev {
+  margin-right: $baseline-unit;
+}
+
+.pagination__button--next {
+  margin-left: $baseline-unit;
+}
+
 .pagination__icon {
   position: relative;
   top: 1px;
@@ -10,3 +18,7 @@
   height: 14px;
   fill: $pagination-icon-color;
 }
+
+.pagination__counter {
+  margin: 0;
+}
diff --git a/app/assets/stylesheets/components/_search_filter.scss b/app/assets/stylesheets/components/_search_filter.scss
@@ -66,6 +66,7 @@
   @include body(18, 24);
   font-weight: 700;
   color: $search-filter-label-color;
+  width: 100%;
 }
 
 .search-filter__label--padded {

diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb
@@ -1,6 +1,6 @@
 <% unless current_page.last? %>
   <span class="next">
-    <%= link_to(url, rel: 'next', class: 'pagination__button button button--compact') do %>
+    <%= link_to(url, rel: 'next', class: 'pagination__button pagination__button--next button button--compact') do %>
     <span class="button--compact__text"><%= t('pagination.next').html_safe %></span>
       <svg title="<%= t('pagination.previous') %>" xmlns="http://www.w3.org/2000/svg" class="pagination__icon">
         <use xlink:href="#icon-pagination-next"></use>

diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb
@@ -1,6 +1,6 @@
 <% unless current_page.first? %>
   <span class="prev">
-    <%= link_to(url, rel: 'prev', class: 'pagination__button button button--compact') do %>
+    <%= link_to(url, rel: 'prev', class: 'pagination__button pagination__button--prev button button--compact') do %>
       <svg title="<%= t('pagination.previous') %>" xmlns="http://www.w3.org/2000/svg" class="pagination__icon">
         <use xlink:href="#icon-pagination-prev"></use>
       </svg>

diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
@@ -4,8 +4,10 @@
 
     <%= render partial: 'search/partials/search_filter' %>
 
-    <%= render partial: 'search/partials/results' %>
+    <div class="l-results__main">
+      <%= render partial: 'search/partials/results' %>
 
-    <%= render partial: 'search/partials/footer_links' %>
+      <%= render partial: 'search/partials/footer_links' %>
+    </div>
   </div>
 </div>
diff --git a/app/views/search/partials/_footer_links.html.erb b/app/views/search/partials/_footer_links.html.erb
@@ -1,16 +1,14 @@
-<div class="l-results__main">
-  <div class="l-results__feedback">
-    <a href="https://www.moneyadviceservice.org.uk/<%= I18n.locale %>/improvements/?source=rad"><%= t('feedback_button') %></a>
-  </div>
-
-  <% if @result.try { firms.any? } %>
-    <div class="l-results__back-to-top back-to-top">
-      <%= link_to '#top', class: 'back-to-top__link' do %>
-        <%= t('search.back_to_top') %>
-        <svg title="<%= t('search.back_to_top') %>" xmlns="http://www.w3.org/2000/svg" class="back-to-top__icon">
-          <use xlink:href="#icon-back-to-top"></use>
-        </svg>
-      <% end %>
-    </div>
-  <% end %>
+<div class="l-results__feedback">
+  <a href="https://www.moneyadviceservice.org.uk/<%= I18n.locale %>/improvements/?source=rad"><%= t('feedback_button') %></a>
 </div>
+
+<% if @result.try { firms.any? } %>
+  <div class="l-results__back-to-top back-to-top">
+    <%= link_to '#top', class: 'back-to-top__link' do %>
+      <%= t('search.back_to_top') %>
+      <svg title="<%= t('search.back_to_top') %>" xmlns="http://www.w3.org/2000/svg" class="back-to-top__icon">
+        <use xlink:href="#icon-back-to-top"></use>
+      </svg>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/search/partials/_results.html.erb b/app/views/search/partials/_results.html.erb
@@ -1,25 +1,23 @@
-<div class="l-results__main">
-  <% if @form.valid? %>
-    <% if @result.firms.any? %>
-      <div class="l-results__summary">
-        <p class="l-results__summary-text t-results-summary-text">
-          <%= t('search.summary_of_results.showing',
-                first_record: @result.first_record,
-                last_record: @result.last_record,
-                total_records: @result.total_records) %>
-        </p>
-      </div>
-    <% else %>
-      <p><%= t('search.no_results_message') %></p>
-    <% end %>
+<% if @form.valid? %>
+  <% if @result.firms.any? %>
+    <div class="l-results__summary">
+      <p class="l-results__summary-text t-results-summary-text">
+        <%= t('search.summary_of_results.showing',
+              first_record: @result.first_record,
+              last_record: @result.last_record,
+              total_records: @result.total_records) %>
+      </p>
+    </div>
+  <% else %>
+    <p><%= t('search.no_results_message') %></p>
+  <% end %>
 
-    <ol class="l-results__list">
-      <%= render partial: 'search/partials/firm', collection: @result.firms, as: :firm %>
-    </ol>
+  <ol class="l-results__list">
+    <%= render partial: 'search/partials/firm', collection: @result.firms, as: :firm %>
+  </ol>
 
-    <%= paginate @result %>
+  <%= paginate @result %>
 
-  <% else %>
-    <p class="t-incorrect-criteria"><%= t('search.incorrect_search_criteria') %></p>
-  <% end %>
-</div>
+<% else %>
+  <p class="t-incorrect-criteria"><%= t('search.incorrect_search_criteria') %></p>
+<% end %>