govuk_publishing_components 21.57.1 → 21.60.2

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-related.scss

@@ -12,6 +12,7 @@
 
 .gem-c-step-nav-related__links {
   @include govuk-font(16);
+  list-style: none;
   margin: 0;
   padding: 0;
 }
@@ -42,10 +43,6 @@
   }
 }
 
-.gem-c-step-nav-related__links {
-  list-style: none;
-}
-
 .gem-c-step-nav-related__link-item {
   margin-top: govuk-spacing(3);
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss

@@ -29,7 +29,7 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
 // we want to ensure that both large and small step navs have the same size font on mobile
 // this will stop text resizing if compatibility mode is turned off
 @mixin step-nav-font($size, $tablet-size: $size, $weight: normal, $line-height: 1.3, $tablet-line-height: $line-height) {
-  @include govuk-typography-common();
+  @include govuk-typography-common;
   font-size: $size + px;
   font-weight: $weight;
   line-height: $line-height;
@@ -122,7 +122,7 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
     @include govuk-media-query($from: tablet) {
       padding-left: govuk-spacing(9);
 
-      &:after {
+      &:after { // stylelint-disable-line max-nesting-depth
         @include step-nav-line-position-large;
         top: govuk-spacing(6);
       }
@@ -145,12 +145,8 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
   }
 
   &:after {
-    // scss-lint:disable DuplicateProperty
-    // sass-lint:disable no-duplicate-properties
     height: -webkit-calc(100% - #{govuk-spacing(3)}); // fallback for iphone 4
     height: calc(100% - #{govuk-spacing(3)});
-    // sass-lint:enable no-duplicate-properties
-    // scss-lint:enable DuplicateProperty
   }
 
   .gem-c-step-nav__help:after {
@@ -322,12 +318,6 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
 
   + .gem-c-step-nav__list {
     margin-top: -5px;
-
-    .gem-c-step-nav--large & {
-      @include govuk-media-query($from: tablet) {
-        margin-top: -govuk-spacing(3);
-      }
-    }
   }
 
   .gem-c-step-nav--large & {
@@ -335,6 +325,12 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
       padding-bottom: govuk-spacing(6);
     }
   }
+
+  .gem-c-step-nav--large & + .gem-c-step-nav__list {
+    @include govuk-media-query($from: tablet) {
+      margin-top: -govuk-spacing(3);
+    }
+  }
 }
 
 .gem-c-step-nav__list {

data/app/assets/stylesheets/govuk_publishing_components/components/_table.scss

@@ -37,28 +37,26 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       padding-right: $sort-link-arrow-size;
       color: $govuk-link-colour;
       text-decoration: none;
+    }
 
-      &:focus {
-        @include govuk-focused-text;
-      }
-
-      &::after {
-        content: "";
-        position: absolute;
-        top: 5px;
-        right: 0;
-
-        @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size-small, $display: block);
-      }
+    .app-table__sort-link:focus {
+      @include govuk-focused-text;
+    }
 
-      &::before {
-        content: "";
-        position: absolute;
-        top: 13px;
-        right: 0;
+    .app-table__sort-link:after {
+      content: "";
+      position: absolute;
+      top: 5px;
+      right: 0;
+      @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size-small, $display: block);
+    }
 
-        @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size-small, $display: block);
-      }
+    .app-table__sort-link:before {
+      content: "";
+      position: absolute;
+      top: 13px;
+      right: 0;
+      @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size-small, $display: block);
     }
   }
 
@@ -81,12 +79,12 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       }
     }
 
-    .app-table__sort-link--ascending::before,
-    .app-table__sort-link--descending::before {
+    .app-table__sort-link--ascending:before,
+    .app-table__sort-link--descending:before {
       content: none;
     }
 
-    .app-table__sort-link--ascending::after {
+    .app-table__sort-link--ascending:after {
       content: "";
       position: absolute;
       top: $sort-link-arrow-spacing;
@@ -96,7 +94,7 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size, $display: inline-block);
     }
 
-    .app-table__sort-link--descending::after {
+    .app-table__sort-link--descending:after {
       content: "";
       position: absolute;
       top: $sort-link-arrow-spacing;
@@ -105,7 +103,6 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
 
       @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size, $display: inline-block);
     }
-
   }
 
   .govuk-table__row {

data/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss

@@ -11,25 +11,21 @@
 // We have some styles within GOVUK (.content-block) which can leak into the list styles for this component.
 // These styles are defined in Static: https://github.com/alphagov/static/blob/a815620cada7ea1c65428c1c3b3ac4dbe28977bf/app/assets/stylesheets/helpers/_text.scss
 // This sets more specific selectors so those unwanted styles are overidden
-// scss-lint:disable QualifyingElement
-// sass-lint:disable no-qualifying-elements
-ul.govuk-tabs__list {
+ul.govuk-tabs__list { // stylelint-disable-line selector-no-qualifying-type
   margin: 0;
   padding: 0;
   list-style: none;
   @include govuk-responsive-margin(6, "bottom");
 }
 
-li.govuk-tabs__list-item {
+li.govuk-tabs__list-item { // stylelint-disable-line selector-no-qualifying-type
   margin-left: govuk-spacing(5);
 }
 
-.js-enabled {
+.js-enabled { // stylelint-disable-line no-duplicate-selectors
   @include govuk-media-query($from: tablet) {
-    ul.govuk-tabs__list {
+    ul.govuk-tabs__list { // stylelint-disable-line selector-no-qualifying-type
       margin-bottom: 0;
     }
   }
 }
-// scss-lint:enable QualifyingElement
-// sass-lint:enable no-qualifying-elements

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -5,6 +5,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
 
   // Scope attachment and attachment-link component styles to gem-c-govspeak

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss

@@ -1,7 +1,6 @@
 @import "govuk/components/button/button";
 
-// scss-lint:disable PlaceholderInExtend
-// sass-lint:disable placeholder-in-extend
+// stylelint-disable scss/at-extend-no-missing-placeholder
 .gem-c-govspeak {
   .gem-c-button {
     @extend .govuk-button;
@@ -11,5 +10,3 @@
     @extend .govuk-button--start;
   }
 }
-// sass-lint:enable placeholder-in-extend
-// scss-lint:enable PlaceholderInExtend

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss

@@ -9,6 +9,8 @@
 // adapted from magna-charta example stylesheet
 // https://github.com/alphagov/magna-charta/blob/master/demo/stylesheets/magna-charta.css
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   // DEFAULT CHART STYLES
 
@@ -27,8 +29,9 @@
   $chart-border: govuk-colour("white"); // Chart border colour
   $key-border: govuk-colour("white"); // Key border colour
   $bar-colours: govuk-colour("blue"), govuk-colour("turquoise"), govuk-colour("green"), govuk-colour("light-green"), govuk-colour("yellow"), govuk-colour("orange"), govuk-colour("red"), govuk-colour("bright-purple", $legacy: "bright-red");
-  $bar-cell-colour: #ebebeb;
-  $bar-outdented-colour: #111111;
+  $bar-text-colours: govuk-colour("white"), govuk-colour("black"), govuk-colour("white"), govuk-colour("black"), govuk-colour("black"), govuk-colour("black"), govuk-colour("white"), govuk-colour("white");
+  $bar-cell-colour: govuk-colour("black");
+  $bar-outdented-colour: govuk-colour("black");
 
   // CHART STYLES
   .mc-chart {
@@ -138,6 +141,7 @@
         @for $i from 0 to length($bar-colours) {
           .mc-bar-#{$i + 1} {
             background-color: nth($bar-colours, $i + 1);
+            color: nth($bar-text-colours, $i + 1);
           }
         }
 
@@ -266,10 +270,6 @@
     text-align: left;
   }
 
-  .mc-chart.mc-negative .mc-td.mc-key-cell {
-    padding-right: 25px;
-  }
-
   .mc-toggle-link {
     display: block;
     margin-top: 30px;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_contact.scss

@@ -5,6 +5,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   // .address is used by the `$A` markdown pattern
   .address,

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss

@@ -9,6 +9,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   .footnotes {
     border-top: 1px solid govuk-colour("mid-grey", $legacy: "grey-2");

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss

@@ -1,3 +1,5 @@
+// stylelint-disable max-nesting-depth
+
 $highlight-answer-bg-color: govuk-colour("green");
 $highlight-answer-color: govuk-colour("white");
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss

@@ -1,4 +1,4 @@
-.gem-c-govspeak  .place {
+.gem-c-govspeak .place {
   margin: 1.5em 0;
   border-bottom: solid 1px govuk-colour("mid-grey", $legacy: "grey-2");
   padding-bottom: 1.5em;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -9,6 +9,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   @include markdown-typography;
 

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss

@@ -105,7 +105,7 @@
   }
 
   li {
-    margin: 0 0 5px 0;
+    margin: 0 0 5px;
     padding: 0;
 
     p {

data/app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss

@@ -1,3 +1,5 @@
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   .media-player {
     display: none;

data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss

@@ -1,5 +1,3 @@
-// scss-lint:disable SelectorFormat
-
 .gem-c-step-nav-header__part-of {
   display: block;
 }
@@ -11,5 +9,3 @@
 .gem-c-step-nav-header__skip-link {
   display: none;
 }
-
-// scss-lint:enable SelectorFormat

data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav.scss

@@ -1,5 +1,3 @@
-// scss-lint:disable SelectorFormat
-
 $grey-2: #bfc1c3;
 $white: #ffffff;
 $number-circle-size: 35px;
@@ -40,6 +38,7 @@ $stroke-width: 3px;
 }
 
 .gem-c-step-nav__step {
+  padding-left: 60px;
   position: relative;
 }
 
@@ -74,14 +73,9 @@ $stroke-width: 3px;
   padding-bottom: 1em;
 }
 
-.gem-c-step-nav__step {
-  position: relative;
-  padding-left: 60px;
-}
-
 .gem-c-step-nav__title {
   @include govuk-font(19, $weight: bold);
-  margin: 0 0 .5em 0;
+  margin: 0 0 .5em;
   padding: 0;
 }
 
@@ -120,5 +114,3 @@ $stroke-width: 3px;
 .gem-c-step-nav__circle-step-colon {
   display: none;
 }
-
-// scss-lint:enable SelectorFormat

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -0,0 +1,52 @@
+module GovukPublishingComponents
+  class AuditController < GovukPublishingComponents::ApplicationController
+    def show
+      path = Dir.pwd
+
+      components = AuditComponents.new(path)
+      applications = analyse_applications(File.expand_path("..", path))
+      compared_data = AuditComparer.new(components.data, applications)
+
+      @applications = compared_data.applications_data || []
+      @components = compared_data.gem_data || []
+    end
+
+  private
+
+    def analyse_applications(path)
+      results = []
+      applications = %w[
+        calculators
+        collections
+        collections-publisher
+        content-data-admin
+        content-publisher
+        email-alert-frontend
+        feedback
+        finder-frontend
+        frontend
+        government-frontend
+        govspeak-preview
+        info-frontend
+        licence-finder
+        manuals-frontend
+        release
+        search-admin
+        service-manual-frontend
+        signon
+        smart-answers
+        static
+        travel-advice-publisher
+        whitehall
+      ].sort
+
+      applications.each do |application|
+        application_path = [path, application].join("/")
+        app = AuditApplications.new(application_path, application)
+        results << app.data
+      end
+
+      results
+    end
+  end
+end

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -83,8 +83,9 @@ module GovukPublishingComponents
     def components_in_use
       matches = []
 
-      files = Dir["#{@application_path}/app/views/**/*.html.erb"]
+      files = Dir["#{@application_path}/app/views/**/*.erb"]
       files.concat Dir["#{@application_path}/app/**/*.rb"]
+      files.concat Dir["#{@application_path}/lib/**/*.{rb,erb}"]
 
       files.each do |file|
         data = File.read(file)

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -0,0 +1,117 @@
+module GovukPublishingComponents
+  class AuditApplications
+    attr_reader :data
+
+    def initialize(path, name)
+      @path = path
+      application_found = application_exists(path)
+      components_found = []
+      @gem_style_references = []
+
+      if application_found
+        templates = Dir["#{path}/app/views/**/*.erb"]
+        stylesheets = Dir["#{path}/app/assets/stylesheets/**/*.scss"]
+        javascripts = Dir["#{path}/app/assets/javascripts/**/*.js"]
+
+        find_components = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
+
+        @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components/
+        find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print\/)+[a-zA-Z_-]+(?=['"])/
+
+        @find_all_print_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components_print/
+        find_print_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/print\/)[a-zA-Z_-]+(?=['"])/
+
+        @find_all_javascripts = /\/\/[ ]*= require govuk_publishing_components\/all_components/
+        find_javascripts = /(?<=require govuk_publishing_components\/components\/)[a-zA-Z_-]+/
+
+        components_in_templates = find_components(templates, find_components, "templates") || []
+        components_in_stylesheets = find_components(stylesheets, find_stylesheets, "stylesheets") || []
+        components_in_print_stylesheets = find_components(stylesheets, find_print_stylesheets, "print_stylesheets") || []
+        components_in_javascripts = find_components(javascripts, find_javascripts, "javascripts") || []
+
+        ruby_paths = %w[/app/helpers/ /app/presenters/ /lib/]
+        components_in_ruby = []
+        ruby_paths.each do |ruby_path|
+          components_in_ruby << find_components(Dir["#{path}#{ruby_path}**/*.{rb,erb}"], find_components, "ruby") || []
+        end
+        components_in_ruby = components_in_ruby.flatten.uniq
+
+        components_found = [
+          {
+            location: "templates",
+            components: components_in_templates,
+          },
+          {
+            location: "stylesheets",
+            components: components_in_stylesheets,
+          },
+          {
+            location: "print_stylesheets",
+            components: components_in_print_stylesheets,
+          },
+          {
+            location: "javascripts",
+            components: components_in_javascripts,
+          },
+          {
+            location: "ruby",
+            components: components_in_ruby,
+          },
+        ]
+      end
+
+      @data = {
+        name: name,
+        application_found: application_found,
+        components_found: components_found,
+        gem_style_references: @gem_style_references.flatten.uniq.sort,
+      }
+    end
+
+  private
+
+    def find_components(files, find, type)
+      components_found = []
+
+      files.each do |file|
+        src = File.read(file)
+        components_found << find_match(find, src, type)
+        gem_references = find_gem_references(file, src)
+        @gem_style_references << gem_references if gem_references
+      rescue StandardError
+        puts "File #{file} not found"
+      end
+
+      components_found.flatten.uniq.sort
+    end
+
+    def find_match(find, src, type)
+      return %w[all] if src.match(@find_all_stylesheets) && type == "stylesheets"
+      return %w[all] if src.match(@find_all_print_stylesheets) && type == "print_stylesheets"
+      return %w[all] if src.match(@find_all_javascripts) && type == "javascripts"
+
+      matches = src.scan(find)
+      all_matches = []
+      matches.each do |match|
+        all_matches << clean_file_name(match.tr('[])\'"', ""))
+      end
+
+      all_matches
+    end
+
+    def find_gem_references(file, src)
+      find_gem_classes = /gem-c-[-_a-zA-Z]+/
+      clean_file_path = /(?<=#{Regexp.escape(@path)}\/)[\/a-zA-Z_-]+.[a-zA-Z.]+/
+
+      return file[clean_file_path] if find_gem_classes.match?(src)
+    end
+
+    def clean_file_name(name)
+      name.tr("_-", " ").strip
+    end
+
+    def application_exists(directory)
+      File.directory?(directory)
+    end
+  end
+end