Merge pull request #3161 from alphagov/fix-sass-deprecations

Fix Sass mixed declarations deprecations

app/assets/stylesheets/_user_research_recruitment_banner.scss

@@ -17,6 +17,6 @@
 }
 
 .user-research-recruitment-banner__buttons {
-  @include govuk-responsive-padding(6, "bottom");
   align-items: center;
+  @include govuk-responsive-padding(6, "bottom");
 }

app/assets/stylesheets/components/_accessible-autocomplete.scss

@@ -1,15 +1,15 @@
 @import "accessible-autocomplete/dist/accessible-autocomplete.min";
 
 .autocomplete__wrapper * {
+  // The styles for the dropdown arrow set the z-index to -1, which place it
+  // behind the autocomplete. Setting the `z-index` on the wrapper seems to fix
+  // this. See: https://github.com/alphagov/accessible-autocomplete/issues/351#issuecomment-582935867
+  z-index: 0;
   // This ensures the font family of all children is '"GDS Transport", arial,
   // sans-serif'. Without this (and the universal selector above), the font of
   // the input and options will be nonstandard. For me, Arial and Times
   // respectively. See: https://github.com/alphagov/accessible-autocomplete/issues/285
   @include govuk-typography-common;
-  // The styles for the dropdown arrow set the z-index to -1, which place it
-  // behind the autocomplete. Setting the `z-index` on the wrapper seems to fix
-  // this. See: https://github.com/alphagov/accessible-autocomplete/issues/351#issuecomment-582935867
-  z-index: 0;
 }
 
 .autocomplete__input--focused + .autocomplete__dropdown-arrow-down {
@@ -35,4 +35,4 @@
   &--enabled {
     display: inline-block;
   }
-}
+}

app/assets/stylesheets/components/_contact-details.scss

@@ -1,13 +1,12 @@
 .app-c-contact-details {
+  padding-left: govuk-spacing(3);
+  clear: both;
+  border-left: 1px solid $govuk-border-colour;
+
   @include govuk-font($size: 19);
   @include govuk-text-colour;
-  padding-left: govuk-spacing(3);
   // Margin top intended to collapse
   // This adds an additional 10px to the paragraph above
   @include govuk-responsive-margin(6, "top");
   @include govuk-responsive-margin(6, "bottom");
-
-  clear: both;
-
-  border-left: 1px solid $govuk-border-colour;
 }

app/assets/stylesheets/components/_table.scss

@@ -36,11 +36,11 @@ $table-row-even-background-colour: govuk-colour("light-grey");
     }
 
     .app-table__sort-link {
-      @include govuk-link-style-no-visited-state;
       position: relative;
       padding-right: $sort-link-arrow-size;
       color: $govuk-link-colour;
       text-decoration: none;
+      @include govuk-link-style-no-visited-state;
     }
 
     .app-table__sort-link:focus {