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 styles #2839

Merged
merged 4 commits into from
Nov 21, 2016
Merged

Remove external link styles #2839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ad83f3
Upgrade govuk_frontend_toolkit to 5.0.0
fofr Nov 18, 2016
6c60018
Remove external link styles
fofr Nov 18, 2016
f62296a
Correct typo in accordion asset
fofr Nov 18, 2016
17dcad5
Remove guidance about external link icon
fofr Nov 21, 2016
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ end
if ENV['FRONTEND_TOOLKIT_DEV']
gem 'govuk_frontend_toolkit', path: '../govuk_frontend_toolkit_gem'
else
gem 'govuk_frontend_toolkit', '4.16.0'
gem 'govuk_frontend_toolkit', '5.0.0'
end

gem 'sass', '3.4.9'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ GEM
bootstrap-sass (= 3.3.5.1)
jquery-rails (~> 3.1.3)
rails (>= 3.2.0)
govuk_frontend_toolkit (4.16.0)
govuk_frontend_toolkit (5.0.0)
rails (>= 3.1.0)
sass (>= 3.2.0)
govuk_sidekiq (0.0.4)
Expand Down Expand Up @@ -484,7 +484,7 @@ DEPENDENCIES
govuk-content-schema-test-helpers (= 1.4.0)
govuk-lint (~> 0.5.1)
govuk_admin_template (= 4.2.0)
govuk_frontend_toolkit (= 4.16.0)
govuk_frontend_toolkit (= 5.0.0)
govuk_sidekiq (= 0.0.4)
graphviz_transitions
invalid_utf8_rejector (~> 0.0.1)
Expand Down
0 app/assets/images/accordian-arrow.png → app/assets/images/accordion-arrow.png
View file
Open in desktop
File renamed without changes
Binary file removed app/assets/images/external-link-white-12x12.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/external-link-white-24x24.png
View file
Open in desktop
Binary file not shown.
8 changes: 0 additions & 8 deletions app/assets/stylesheets/frontend/global/_links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,8 @@ a {
&:focus {
text-decoration: underline;
}
&[rel="external"] {
@include external-link-13-no-hover;
@include media(tablet) {
@include external-link-19-no-hover;
}
}

* {
cursor: pointer;
}
}


3 changes: 0 additions & 3 deletions app/assets/stylesheets/frontend/helpers/_attachment.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ $thumbnail-width: 99px;
.opendocument-help {
margin: 0;
@include ig-core-14;
a {
@include external-link-14;
}
}

.accessibility-warning {
Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/frontend/helpers/_featured-links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,5 @@
@include media(tablet) {
padding-bottom: $gutter-one-sixth;
}

a[rel="external"] {
@include external-link-14-bold-no-hover;
@include media(tablet) {
@include external-link-16-bold-no-hover;
}
}
}
}
4 changes: 0 additions & 4 deletions app/assets/stylesheets/frontend/helpers/_featured_news.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@
padding-top: 0;
a {
font-weight: bold;
&[rel=external] {
@include external-link-19-bold-no-hover;
}
}
}
h3 {
Expand All @@ -80,4 +77,3 @@
}
}
}

2 changes: 1 addition & 1 deletion app/assets/stylesheets/frontend/helpers/_historic-people-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
text-decoration: none;
zoom: 1;

background: transparent image-url("accordian-arrow.png") $full-width -40px no-repeat;
background: transparent image-url("accordion-arrow.png") $full-width -40px no-repeat;

margin-left: 0;
padding: 0.5em 2em 0.5em 0;
Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/frontend/helpers/_metadata-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@
}
}

a[rel="external"] {
@include external-link-12;
@include media(tablet) {
@include external-link-14;
}
}

.change-notes-title {
@include media(desktop){
clear: left;
Expand Down
18 changes: 0 additions & 18 deletions app/assets/stylesheets/frontend/styleguide/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,32 +121,14 @@
}
}

// TODO (@bfirsh): refactor frontend_toolkit external link mixin to work with
// white icons: https://github.com/alphagov/govuk_frontend_toolkit/pull/51
@mixin external-link-white {
&:after {
background-image: image-url("external-link-white-12x12.png");
background-repeat: no-repeat;

@include device-pixel-ratio() {
background-image: image-url("external-link-white-24x24.png");
background-size: 12px 400px;
}
}
}

@mixin white-links {
a,
a:visited,
a:hover {
color: $white;
text-decoration: underline;
&[rel="external"] {
@include external-link-white;
}
}
a:active {
color: $link-active-colour;
}
}

4 changes: 0 additions & 4 deletions app/assets/stylesheets/frontend/views/_html-publications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,6 @@
ol+p {
margin-top: $gutter-one-third;
}

a[rel="external"] {
@include external-link-14;
}
}
}

Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/frontend/views/_organisations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,6 @@
ul {
margin-top: $gutter-one-third;
}
a[rel=external] {
@include external-link-16-bold-no-hover;
}
}
.large {
ul {
Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/frontend/views/_world_locations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@
li {
list-style: none;
margin-bottom: $gutter-one-sixth;

a[rel="external"] {
@include external-link-14-bold-no-hover;
@include media(tablet) {
@include external-link-16-bold-no-hover;
}
}
}
}
@include media(tablet) {
Expand Down
1 change: 0 additions & 1 deletion app/views/admin/editions/_govspeak_help.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ Don’t use a single # – this is H1 and is for the title only</pre>

<p>For external websites, use the full URL including http://:</p>
<pre>[link text](http://www.example.com)</pre>
<p>The link will display with an external link symbol.</p>

<h4>Linking to paragraphs</h4>
<p>
Expand Down