Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove external link icons #846

Merged
merged 1 commit into from
Oct 31, 2016
Merged

Remove external link icons #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -279,4 +279,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.10.6
1.12.5
3 changes: 0 additions & 3 deletions app/assets/stylesheets/govuk-component/_govspeak.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,6 @@

.opendocument-help {
@include core-14;
a {
@include external-link-14;
}
}

.accessibility-warning {
Expand Down
4 changes: 0 additions & 4 deletions app/assets/stylesheets/govuk-component/_metadata.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,4 @@
&.direction-rtl dd {
float: right;
}

a[rel="external"] {
@include external-link-14;
}
}
13 changes: 2 additions & 11 deletions app/assets/stylesheets/helpers/_core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
11 changes: 3 additions & 8 deletions app/assets/stylesheets/helpers/_publisher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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: "";
}
15 changes: 0 additions & 15 deletions app/assets/stylesheets/helpers/_text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -417,10 +410,6 @@ article {
margin-top: 2em;
}

.info-notice a[rel="external"] {
display: inline;
}

.form-download {
padding: 0.25em 0 0.25em 0;

Expand All @@ -440,10 +429,6 @@ article {
background-size: 25px 25px;
}
}

a[rel="external"]:after {
content: none;
}
}

.address {
Expand Down