Merge pull request #846 from alphagov/remove-external-link-icons

Remove external link icons
alphagov · Oct 31, 2016 · f44470e · f44470e
2 parents e99fb65 + f58226f
commit f44470e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 48 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,11 +40,11 @@ group :development, :test do
 end
 
 gem 'plek', '1.11.0'
-gem 'govuk_frontend_toolkit', '~> 4.18.3'
+gem 'govuk_frontend_toolkit', '~> 5.0.0'
 
 if ENV['GOVUK_TEMPLATE_DEV']
   gem 'govuk_template', :path => "../govuk_template"
 else
-  gem 'govuk_template', '0.18.3'
+  gem 'govuk_template', '0.19.0'
 end
 gem 'gds-api-adapters', '26.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -85,10 +85,10 @@ GEM
     govuk-lint (0.6.1)
       rubocop (~> 0.35.0)
       scss_lint (~> 0.44.0)
-    govuk_frontend_toolkit (4.18.3)
+    govuk_frontend_toolkit (5.0.0)
       rails (>= 3.1.0)
       sass (>= 3.2.0)
-    govuk_template (0.18.3)
+    govuk_template (0.19.0)
       rails (>= 3.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -256,8 +256,8 @@ DEPENDENCIES
   gds-api-adapters (= 26.7.0)
   govuk-content-schema-test-helpers (~> 1.4)
   govuk-lint (~> 0.6.0)
-  govuk_frontend_toolkit (~> 4.18.3)
-  govuk_template (= 0.18.3)
+  govuk_frontend_toolkit (~> 5.0.0)
+  govuk_template (= 0.19.0)
   image_optim (= 0.17.1)
   jasmine-rails (~> 0.10.6)
   logstasher (= 0.4.8)
@@ -279,4 +279,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.6
+   1.12.5
diff --git a/app/assets/stylesheets/govuk-component/_govspeak.scss b/app/assets/stylesheets/govuk-component/_govspeak.scss
@@ -507,9 +507,6 @@
 
       .opendocument-help {
         @include core-14;
-        a {
-          @include external-link-14;
-        }
       }
 
       .accessibility-warning {

diff --git a/app/assets/stylesheets/govuk-component/_metadata.scss b/app/assets/stylesheets/govuk-component/_metadata.scss
@@ -41,8 +41,4 @@
   &.direction-rtl dd {
     float: right;
   }
-
-  a[rel="external"] {
-    @include external-link-14;
-  }
 }
diff --git a/app/assets/stylesheets/helpers/_core.scss b/app/assets/stylesheets/helpers/_core.scss
@@ -124,15 +124,6 @@ h4 {
       margin: 10px 0 10px;
     }
 
-    a[rel="external"]:after {
-      content: "\A0\A0\A0\A0\A0\A0";
-      background-position: 5px 0;
-    }
-
-    a[rel="external"]:hover:after {
-      background-position: 5px -388px;
-    }
-
   }
   .return-to-top {
     @include core-16;
@@ -533,7 +524,7 @@ header.page-header div {
     a,
     h1 {
       @include core-24($line-height: (45 / 24), $line-height-640: (45 / 17));
-      background: #FFF image-url('accordian-arrow.png') no-repeat 100% -2px;
+      background: #FFF image-url('accordion-arrow.png') no-repeat 100% -2px;
       display: block;
       padding: 0 16px;
       position: relative;
@@ -542,7 +533,7 @@ header.page-header div {
       top: 0;
 
       @include device-pixel-ratio() {
-        background-image: image-url("accordian-arrow-2x.png");
+        background-image: image-url("accordion-arrow-2x.png");
         background-size: 45px 90px;
       }
 

diff --git a/app/assets/stylesheets/helpers/_publisher.scss b/app/assets/stylesheets/helpers/_publisher.scss
@@ -68,11 +68,11 @@ aside .show-all-parts {
 
   @include media-down(mobile) {
     display: block;
-    background: transparent image-url("accordian-arrow.png") 100% 6px no-repeat;
+    background: transparent image-url("accordion-arrow.png") 100% 6px no-repeat;
   }
 
   @include device-pixel-ratio() {
-    background-image: image-url("accordian-arrow-2x.png");
+    background-image: image-url("accordion-arrow-2x.png");
     background-size: 45px 90px;
   }
 
@@ -345,7 +345,7 @@ aside .page-navigation-closed {
     &.previous a {
       padding: 0.75em 0 0.75em 3em;
     }
-    
+
     &.next a {
       padding: 0.75em 3em 0.75em 0;
     }
@@ -432,8 +432,3 @@ aside .page-navigation-closed {
     border-color: $border-colour;
   }
 }
-
-/* once we have added a class to external links generated by govspeak we can ditch this */
-#wrapper .get-started a[rel="external"]:after {
-  content: "";
-}
diff --git a/app/assets/stylesheets/helpers/_text.scss b/app/assets/stylesheets/helpers/_text.scss
@@ -198,13 +198,6 @@ article {
     @include core-16($tabular-numbers: true);
     vertical-align: top;
     padding: .75em .5em .75em 0;
-
-    a[rel="external"] {
-      @include external-link-16;
-      @include media-down(mobile) {
-        @include external-link-14;
-      }
-    }
   }
 
   td {
@@ -417,10 +410,6 @@ article {
     margin-top: 2em;
   }
 
-  .info-notice a[rel="external"] {
-    display: inline;
-  }
-
   .form-download {
     padding: 0.25em 0 0.25em 0;
 
@@ -440,10 +429,6 @@ article {
         background-size: 25px 25px;
       }
     }
-
-    a[rel="external"]:after {
-      content: none;
-    }
   }
 
   .address {